MERGE: リビジョン1672から1680にかけて行われた修正のうち、反映されてないものを追加。

[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..41dd003 100644 (file)
--- a/nucleus/upgrades/upgrade4.0.php
+++ b/nucleus/upgrades/upgrade4.0.php
@@ -30,7 +30,13 @@ function upgrade_do400()
                {
                        $locale = $o->Language;
                }
-               $query = 'UPDATE ' . sql_table('config') . " SET name='Locale' value='{$locale}'";
+               $query = 'INSERT INTO ' . sql_table('config') . " (name, value) VALUE('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);
        }