FIX:管理画面用スキンのsdincmodeをadminからskindirに

管理画面用スキンの判別方法も「sdincmode='admin'」から「sdname LIKE 'ADMIN/%'」に修正

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index 011785b..0cfd4f2 100644 (file)
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -4572,7 +4572,7 @@ class Admin
                if ( !is_object(self::$skin) )\r
                {\r
                        global $DIR_SKINS;\r
-                       $query  = "SELECT min(sdnumber) FROM %s WHERE sdname != 'bookmarklet' AND sdincmode = 'admin'";\r
+                       $query  = "SELECT min(sdnumber) FROM %s WHERE sdname != 'admin/bookmarklet' AND sdname LIKE 'admin/%%'";\r
                        $query  = sprintf($query, sql_table('skin_desc'));\r
                        $res    = intval(DB::getValue($query));\r
                        $query  = "UPDATE %s SET value = %d WHERE name = 'AdminSkin'";\r

diff --git a/skins/admin/bookmarklet/skinbackup.xml b/skins/admin/bookmarklet/skinbackup.xml
index 9ecc31c..fe47d31 100644 (file)
--- a/skins/admin/bookmarklet/skinbackup.xml
+++ b/skins/admin/bookmarklet/skinbackup.xml
@@ -5,7 +5,7 @@
 <template name="admin/bookmarklet"/>\r
 <info><![CDATA[20120430]]></info>\r
 </meta>\r
-<skin name="admin/bookmarklet" type="text/html" includeMode="admin" includePrefix="admin/bookmarklet">\r
+<skin name="admin/bookmarklet" type="text/html" includeMode="skindir" includePrefix="admin/bookmarklet">\r
 <description>\r
 <![CDATA[ADMIN Area Default Bookmarklet Skin]]>\r
 </description>\r

diff --git a/skins/admin/default/skinbackup.xml b/skins/admin/default/skinbackup.xml
index 145491a..95591f7 100644 (file)
--- a/skins/admin/default/skinbackup.xml
+++ b/skins/admin/default/skinbackup.xml
@@ -5,7 +5,7 @@
     <template name="admin/default"/>\r
     <info><![CDATA[20120414]]></info>\r
   </meta>\r
-  <skin name="admin/default" type="text/html" includeMode="admin" includePrefix="admin/default">\r
+  <skin name="admin/default" type="text/html" includeMode="skindir" includePrefix="admin/default">\r
     <description><![CDATA[ADMIN Area Default skin]]></description>\r
     <part name="actionlog"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>\r
         <h2><%text(_ACTIONLOG_CLEAR_TITLE)%></h2>\r