FIX:グローバル設定に準じている管理エリア・ブックマークレットのスキン設定を-サイトの設定を使う -と表示するように修正

[nucleus-jp/nucleus-next.git] / nucleus / upgrades / upgrade4.0.php

diff --git a/nucleus/upgrades/upgrade4.0.php b/nucleus/upgrades/upgrade4.0.php
index 1c00998..fc5a1df 100644 (file)
--- a/nucleus/upgrades/upgrade4.0.php
+++ b/nucleus/upgrades/upgrade4.0.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
- * Copyright (C) 2002-2009 The Nucleus Group
+ * Copyright (C) 2002-2012 The Nucleus Group
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -11,7 +11,7 @@
  */
 /**
  * @license http://nucleuscms.org/license.txt GNU General Public License
- * @copyright Copyright (C) 2002-2009 The Nucleus Group
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group
  * @version $Id: upgrade2.0.php 1388 2009-07-18 06:31:28Z shizuki $
  */
 
@@ -25,12 +25,18 @@ function upgrade_do400()
        /* config.Language to config.Locale  */
        if ( !upgrade_checkIfColumnExists('config','Locale') )
        {
-               $res = sql_query("SELECT * FROM " . sql_table('config') . " WHERE name='Language'");
-               while ( $o = mysql_fetch_object($res) )
+               $res = DB::getResult("SELECT * FROM " . sql_table('config') . " WHERE name='Language'");
+               foreach ( $res as $row )
                {
-                       $locale = $o->Language;
+                       $locale = $row['Language'];
                }
-               $query = 'UPDATE ' . sql_table('config') . " SET name='Locale' value='{$locale}'";
+               $query = 'INSERT INTO ' . sql_table('config') . " (name, value) VALUES ('Locale', '{$locale}');";
+               upgrade_query("Renaming Language for configs to Locale", $query);
+       }
+       
+       if ( !upgrade_checkIfColumnExists('config','Language') )
+       {
+               $query = "DELETE * FROM " . sql_table('config') . " WHERE name='Language'";
                upgrade_query("Renaming Language for configs to Locale", $query);
        }