FIX:テンプレートが指定されていなかった部分を修正

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index 7b20a69..c82f1ec 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -1282,7 +1282,7 @@ class AdminActions extends BaseActions
         * @param       void
         * @return      void
         */     
-       public function parse_adminskinselectoptions()
+       public function parse_adminskinselectoptions($templateName = '')
        {
                global $CONF;
                $query = "SELECT sdname as text, sdnumber as value FROM %s WHERE sdname LIKE 'admin/%%';";
@@ -1291,7 +1291,7 @@ class AdminActions extends BaseActions
                $template['name'] = 'adminskin';
                $template['selected'] = $CONF['AdminSkin'];
                $template['tabindex'] = 110;
-               Showlist($query, 'select', $template, '');
+               Showlist($query, 'select', $template, $templateName);
                return;
        }
        

diff --git a/skins/admin/default/skinbackup.xml b/skins/admin/default/skinbackup.xml
index f5bafe7..03b4b53 100644 (file)
--- a/skins/admin/default/skinbackup.xml
+++ b/skins/admin/default/skinbackup.xml
@@ -11,7 +11,7 @@
         <h2><%text(_ACTIONLOG_CLEAR_TITLE)%></h2>
         <p><a href="<%adminurl%><%addtickettourl(index.php?action=clearactionlog)%>"><%text(_ACTIONLOG_CLEAR_TEXT)%></a></p>
         <h2><%text(_ACTIONLOG_TITLE)%></h2>
-        <%actionloglist%><%pagefoot%>]]></part>
+        <%actionloglist(admin/default)%><%pagefoot%>]]></part>
     <part name="activate"><![CDATA[<%pagehead%><h2><%activationmessage(title)%></h2>
              <p><%activationmessage(text)%></p>
              <p class="error"><%headmessage%></p>
@@ -253,7 +253,7 @@ selector();
     <part name="adminskinoverview"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>
         <h2><%text(_SKIN_EDIT_TITLE)%></h2>
         <h3><%text(_SKIN_AVAILABLE_TITLE)%></h3>
-        <%adminskinoverview%>
+        <%adminskinoverview(admin/default)%>
         <h3><%text(_SKIN_NEW_TITLE)%></h3>
         <form method="post" action="<%adminurl%>index.php">
             <div>
@@ -467,7 +467,7 @@ selector();
     <part name="admntemplateoverview"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>
         <h2><%text(_TEMPLATE_TITLE)%></h2>
         <h3><%text(_TEMPLATE_AVAILABLE_TITLE)%></h3>
-        <%admintemplateoverview%>
+        <%admintemplateoverview(admin/default)%>
         <h3><%text(_TEMPLATE_NEW_TITLE)%></h3>
         <form method="post" action="<%adminurl%>index.php">
             <div>
@@ -1190,7 +1190,7 @@ selector();
                             <%text(_EBLOG_DEFSKIN)%>
                             <%helplink(blogdefaultskin)%>
                         </td>
-                        <td><%defskinselect%></td>
+                        <td><%defskinselect(blog,admin/default)%></td>
                     </tr><tr>
                         <td>
                             <%text(_EBLOG_OFFSET)%>
@@ -1279,7 +1279,7 @@ selector();
                         </tr><%if(superadmin)%><tr>
                             <td><%text(_SKINABLEADMIN_MEMBERS_ADMINSKIN)%> <%customhelplink(useadminskin)%></td>
                             <td>
-                                    <%adminskinselectoptions%>
+                                    <%adminskinselectoptions(admin/default)%>
                             </td>
                         </tr><%endif%>
                         <%pluginoptions(member)%>
@@ -1700,7 +1700,7 @@ selector();
                     <form method="get" action="<%adminurl%>index.php">
                         <div>
                             <input type="hidden" name="action" value="createitem" />
-                            <%qmenuaddselect%>
+                            <%qmenuaddselect(admin/default)%>
                         </div>
                     </form>
             
@@ -1835,10 +1835,10 @@ selector();
                         <th colspan="2"><%text(_SETTINGS_SUB_GENERAL)%></th>
                     </tr><tr>
                         <td><%text(_SETTINGS_DEFBLOG)%> <%helplink(defaultblog)%></td>
-                        <td><%defblogselect%></td>
+                        <td><%defblogselect(admin/default)%></td>
                     </tr><tr>
                         <td><%text(_SETTINGS_BASESKIN)%> <%helplink(baseskin)%></td>
-                        <td><%defskinselect(global)%></td>
+                        <td><%defskinselect(,admin/default)%></td>
                     </tr><tr>
                         <td><%text(_SETTINGS_ADMINMAIL)%></td>
                         <td><input name="AdminEmail" tabindex="10010" size="40" value="<%configsettingsedit(AdminEmail)%>" /></td>
@@ -2154,7 +2154,7 @@ selector();
     <part name="skinoverview"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>
         <h2><%text(_SKIN_EDIT_TITLE)%></h2>
         <h3><%text(_SKIN_AVAILABLE_TITLE)%></h3>
-        <%skinoverview%>
+        <%skinoverview(admin/default)%>
         <h3><%text(_SKIN_NEW_TITLE)%></h3>
         <form method="post" action="<%adminurl%>index.php">
             <div>
@@ -2394,7 +2394,7 @@ selector();
     <part name="templateoverview"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=manage">(<%text(_BACKTOMANAGE)%>)</a></p>
         <h2><%text(_TEMPLATE_TITLE)%></h2>
         <h3><%text(_TEMPLATE_AVAILABLE_TITLE)%></h3>
-        <%templateoverview%>
+        <%templateoverview(admin/default)%>
         <h3><%text(_TEMPLATE_NEW_TITLE)%></h3>
         <form method="post" action="<%adminurl%>index.php">
             <div>