カスタムスキンインストールのロジック修正

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk@1041 1ca29b6e-896d-4ea0-84a5-967f57386b96

diff --git a/utf8/install.php b/utf8/install.php
index 1905c85..951b573 100755 (executable)
--- a/utf8/install.php
+++ b/utf8/install.php
@@ -51,9 +51,9 @@ $aConfPlugsToInstall = array(
 //     array('base','rsd')\r
 $aConfSkinsToImport = array(\r
     'atom',\r
-    'default',\r
-    'rsd',\r
     'rss2.0',\r
+    'rsd',\r
+    'default',\r
 );\r
 \r
 /*\r
@@ -596,7 +596,7 @@ function doInstall() {
 \r
 // <add for garble measure>\r
     // 2-2. set DEFAULT CHARSET and COLLATE\r
-    $mySqlVer = implode('.', array_map('intval', explode('.', mysql_get_server_info($MYSQL_CONN))));\r
+    $mySqlVer = implode('.', array_map('intval', explode('.', sql_get_server_info($MYSQL_CONN))));\r
     if ($mySqlVer >= '5.0.7' && phpversion() >= '5.2.3') {\r
         mysql_set_charset($charset);\r
     } elseif ($mySqlVer >= '4.1.0') {\r
@@ -811,6 +811,10 @@ function doInstall() {
 \r
         // 11. install custom skins\r
         $aSkinErrors = installCustomSkins($manager);\r
+        $defskinQue  = 'SELECT `sdnumber` as result FROM ' . sql_table('skin_desc') . ' WHERE `sdname` = "default"';\r
+        $defSkinID   = quickQuery($defskinQue);\r
+        $updateQuery = 'UPDATE ' . sql_table('blog') . ' SET `bdefskin` = ' . intval($defSkinID) . ' WHERE `bnumber` = 1';\r
+        sql_query($updateQuery);\r
 \r
         // 12. install NP_Ping, if decided\r
         if ($weblog_ping == 1) {\r
@@ -1028,11 +1032,14 @@ function installCustomPlugs(&$manager) {
     return $aErrors;\r
 }\r
 \r
-//function installCustomSkins(&$manager) {\r
-function installCustomSkins(&$mngr) {\r
-    global $aConfSkinsToImport, $DIR_LIBS, $DIR_SKINS, $manager;\r
-    $manager = new MANAGER;\r
-    $aErrors = array();\r
+function installCustomSkins(&$manager) {\r
+    global $aConfSkinsToImport, $DIR_LIBS, $DIR_SKINS;\r
+\r
+       $aErrors = array();\r
+       global $manager;\r
+       if (empty($manager)) {\r
+           $manager = new MANAGER;\r
+       }\r
 \r
     if (count($aConfSkinsToImport) == 0) {\r
         return $aErrors;\r
@@ -1120,7 +1127,7 @@ function updateConfig($name, $val) {
            . " SET   value = '$val'"\r
            . " WHERE name  = '$name'";\r
 \r
-    sql_query($query,$MYSQL_CONN) or _doError(_ERROR26 . ': ' . mysql_error($MYSQL_CONN) );\r
+    sql_query($query,$MYSQL_CONN) or _doError(_ERROR26 . ': ' . sql_error($MYSQL_CONN) );\r
     return sql_insert_id($MYSQL_CONN);\r
 }\r
 \r