「スキン編集」/管理画面用「スキン編集」 画面表示対応

スキン毎、各スキンパーツ毎の編集画面も完了

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index 0e35fcf..6915dcd 100644 (file)
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -4380,7 +4380,7 @@ class Admin
         */\r
        static private function adminskinclonetype($skin, $newid, $type)\r
        {\r
-               $content = $skin->getContent($type);\r
+               $content = $skin->getContentFromDB($type);\r
                \r
                if ( $content )\r
                {\r
@@ -5885,7 +5885,7 @@ class Admin
                        sendContentType(self::$skin->getContentType(), 'skin', i18n::get_current_charset());\r
                }\r
                \r
-               $contents = self::$skin->getContent($type);\r
+               $contents = self::$skin->getContentFromDB($type);\r
                \r
                if ( !$contents )\r
                {\r

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index 01ed6ba..7bd1d23 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -177,6 +177,7 @@ class AdminActions extends BaseActions
                'batchitem'                             => _ADM_SKPRT_BATCHITEM,
                'batchmember'                   => _ADM_SKPRT_BATCHMEMBER,
                'batchmove'                             => _ADM_SKPRT_BATCHMOVE,
+               'batchmovecat'                  => _ADM_SKPRT_BATCHMOVECAT,
                'batchteam'                             => _ADM_SKPRT_BATCHTEAM,
                'blogcommentlist'               => _ADM_SKPRT_BLOGCOMMENTLIST,
                'blogselectbox'                 => _ADM_SKPRT_BLOGSELECTBOX,
@@ -926,10 +927,10 @@ class AdminActions extends BaseActions
                switch ( $type )
                {
                        case 'title':
-                               echo TEMPLATE::fill($title, $aVars);
+                               echo Template::fill($title, $aVars);
                                break;
                        case 'text':
-                               echo TEMPLATE::fill($text,  $aVars);
+                               echo Template::fill($text,  $aVars);
                                break;
                        case 'ackey':
                                echo Entity::hsc($key);
@@ -1114,7 +1115,7 @@ class AdminActions extends BaseActions
                        $template = ob_get_contents();
                        ob_end_clean();
                        
-                       echo TEMPLATE::fill($template, $data);
+                       echo Template::fill($template, $data);
                        return;
                }
        }
@@ -1153,7 +1154,7 @@ class AdminActions extends BaseActions
                        'blogname'                              => Entity::hsc($blog->getName())
                );
                
-               echo TEMPLATE::fill($template, $data);
+               echo Template::fill($template, $data);
                return;
        }
        
@@ -1257,7 +1258,7 @@ class AdminActions extends BaseActions
                                                'expname'       => Entity::hsc($skinObj->sdname),
                                                'expdesc'       => Entity::hsc($skinObj->sddesc),
                                        );
-                                       echo TEMPLATE::fill($template, $data);
+                                       echo Template::fill($template, $data);
                                }
                                break;
                        case 'template':
@@ -1272,7 +1273,7 @@ class AdminActions extends BaseActions
                                                'expname'       => Entity::hsc($templateObj->tdname),
                                                'expdesc'       => Entity::hsc($templateObj->tddesc),
                                        );
-                                       echo TEMPLATE::fill($template, $data);
+                                       echo Template::fill($template, $data);
                                }
                                break;
                }
@@ -1293,7 +1294,7 @@ class AdminActions extends BaseActions
                
                $template['content']    = 'adminskinlist';
                $template['tabindex']   = 10;
-               $template['friendly_names'] = Skin::getAvailableTypes();
+               $template['friendly_names'] = $this->skin->getAvailableTypes();
                Showlist($query, 'table', $template, $templateName);
                return;
        }
@@ -1332,7 +1333,7 @@ class AdminActions extends BaseActions
                        $templates = Template::read($templateName);
                }
                
-               $nType  = Skin::getFriendlyNames('AdminActions');
+               $nType  = $this->skin->getAvailableTypes();
                $skinid = intRequestVar('skinid');
                
                $query = "SELECT stype FROM  %s WHERE stype NOT IN (%s) AND sdesc=%d;";
@@ -1350,7 +1351,7 @@ class AdminActions extends BaseActions
                        {
                                $template['head'] = "<ul>\n";
                        }
-                       echo TEMPLATE::fill($template['head'], $data);
+                       echo Template::fill($template['head'], $data);
                        
                        if ( array_key_exists('ADMIN_SPECIALSKINLIST_BODY', $templates) && !empty($templates['ADMIN_SPECIALSKINLIST_BODY']) )
                        {
@@ -1375,7 +1376,7 @@ class AdminActions extends BaseActions
                                        'skinid'        => $skinid,
                                        'skintype'      => Entity::hsc(strtolower($row['stype']))
                                );
-                               echo TEMPLATE::fill($template['body'], $data);
+                               echo Template::fill($template['body'], $data);
                        }
                        
                        $data = array();
@@ -1387,7 +1388,7 @@ class AdminActions extends BaseActions
                        {
                                $template['foot'] = "</ul>\n";
                        }
-                       echo TEMPLATE::fill($template['foot'], $data);
+                       echo Template::fill($template['foot'], $data);
                }
                return;
        }
@@ -1422,7 +1423,7 @@ class AdminActions extends BaseActions
        {
                global $DIR_ADMINSKINS;
                $skinType = strtolower(trim(requestVar('type')));
-               $actions  = Skin::getAllowedActionsForType($skinType);
+               $actions  = $this->skin->getAllowedActionsForType($skinType);
                sort($actions);
                
                while ( $current = array_shift($actions) )
@@ -1454,7 +1455,9 @@ class AdminActions extends BaseActions
        public function parse_allowedskinactions()
        {
                $skinType = strtolower(trim(requestVar('type')));
-               $actions  = SKIN::getAllowedActionsForType($skinType);
+               $skinid   = intRequestVar('skinid');
+               $skin     = new Skin($skinid);
+               $actions  = $skin->getAllowedActionsForType($skinType);
                sort($actions);
                
                while ( $current = array_shift($actions) )
@@ -1507,7 +1510,7 @@ class AdminActions extends BaseActions
                        $data =  array(
                                Entity::hsc($blog->getName())
                        );
-                       TEMPLATE::fill($template, $data);
+                       Template::fill($template, $data);
                }
                return;
        }
@@ -2331,7 +2334,7 @@ class AdminActions extends BaseActions
                        $templates = Template::read($templateName);
                }
                
-               $types   = Skin::getFriendlyNames('AdminActions');
+               $types   = $this->skin->getAvailableTypes();
                ksort($types);
                
                if ( array_key_exists('ADMINSKINTYPELIST_HEAD', $templates) && !empty($templates['ADMINSKINTYPELIST_HEAD']) )
@@ -2591,9 +2594,9 @@ class AdminActions extends BaseActions
        public function parse_editadminskintype($type = 'id')
        {
                global $CONF, $manager, $member;
-               $skinid = intRequestVar('skinid');
-               $skin   = new Skin($skinid);
-               $fNames = Skin::getFriendlyNames();
+//             $skinid = intRequestVar('skinid');
+//             $skin   = new Skin($skinid);
+               $fNames = $this->skin->getAvailableTypes();
                $sType  = strtolower(trim(requestVar('type')));
                
                switch ( $type )
@@ -2602,16 +2605,16 @@ class AdminActions extends BaseActions
                                echo intRequestVar('skinid');
                                break;
                        case 'name':
-                               echo Entity::hsc($skin->getName());
+                               echo Entity::hsc($this->skin->getName());
                                break;
                        case 'desc':
-                               echo Entity::hsc($skin->getDescription());
+                               echo Entity::hsc($this->skin->getDescription());
                                break;
                        case 'type':
-                               echo Entity::hsc($skin->getContentType());
+                               echo Entity::hsc($this->skin->getContentType());
                                break;
                        case 'content':
-                               echo Entity::hsc($skin->getContent($sType));
+                               echo Entity::hsc($this->skin->getContentFromDB($sType));
                                break;
                        case 'skintype':
                                $skinType = !array_key_exists($sType, $fNames) ? ucfirst($sType) : $fNames[$sType];
@@ -2621,7 +2624,7 @@ class AdminActions extends BaseActions
                                echo Entity::hsc($sType);
                                break;
                        case 'prefix':
-                               echo Entity::hsc($skin->getIncludePrefix());
+                               echo Entity::hsc($this->skin->getIncludePrefix());
                                break;
                        case 'mode':
                                $incMode = $skin->getIncludeMode() ? _PARSER_INCMODE_SKINDIR : _PARSER_INCMODE_NORMAL;
@@ -2691,7 +2694,7 @@ class AdminActions extends BaseActions
                                        $data = array(
                                                'explugtplname' => Entity::hsc($pfkey)
                                        );
-                                       echo TEMPLATE::fill($base, $data);
+                                       echo Template::fill($base, $data);
                                        foreach ( $pfvalue as $pffield => $pfdesc )
                                        {
                                                $this->_templateEditRow($template, $pfdesc, $pffield, '', ++$tabidx, 0, $name);
@@ -2985,7 +2988,7 @@ class AdminActions extends BaseActions
                global $CONF, $manager, $member;
                $skinid = intRequestVar('skinid');
                $skin   = new SKIN($skinid);
-               $fNames = SKIN::getFriendlyNames('Actions');
+               $fNames = $skin->getAvailableTypes();
                $sType  = strtolower(trim(requestVar('type')));
                
                switch ( $type )
@@ -3003,7 +3006,7 @@ class AdminActions extends BaseActions
                                echo Entity::hsc($skin->getContentType());
                                break;
                        case 'content':
-                               echo Entity::hsc($skin->getContent($sType));
+                               echo Entity::hsc($skin->getContentFromDB($sType));
                                break;
                        case 'skintype':
                                $skinType = !array_key_exists($sType, $fNames) ? ucfirst($sType) : $fNames[$sType];
@@ -3055,8 +3058,8 @@ class AdminActions extends BaseActions
        {
                global $manager;
                $templateid                             =  intRequestVar('templateid');
-               $templatename                   =  TEMPLATE::getNameFromId($templateid);
-               $templatedescription    =  TEMPLATE::getDesc($templateid);
+               $templatename                   =  Template::getNameFromId($templateid);
+               $templatedescription    =  Template::getDesc($templateid);
                $template                               =& $manager->getTemplate($templatename);
                switch ( $type )
                {
@@ -3097,7 +3100,7 @@ class AdminActions extends BaseActions
                                        $data = array(
                                                'explugtplname' => Entity::hsc($pfkey)
                                        );
-                                       echo TEMPLATE::fill($base, $data);
+                                       echo Template::fill($base, $data);
                                        foreach ( $pfvalue as $pffield => $pfdesc )
                                        {
                                                $this->_templateEditRow($template, $pfdesc, $pffield, '', ++$tabidx, 0, $name);
@@ -4405,7 +4408,7 @@ class AdminActions extends BaseActions
                                        'plugadmintooltip'      => Entity::hsc($aInfo['tooltip']),
                                        'plugadmintitle'        => Entity::hsc($aInfo['title']),
                                );
-                               echo TEMPLATE::fill($template['body'], $data);
+                               echo Template::fill($template['body'], $data);
                        }
                        if ( array_key_exists('PLUGIN_QUICKMENU_FOOT', $templates) || !empty($templates['PLUGIN_QUICKMENU_FOOT']) )
                        {
@@ -4514,7 +4517,7 @@ class AdminActions extends BaseActions
                                Showlist($query, 'table', $show, $templateName);
                                break;
                        case 'template':
-                               $query = "SELECT tdname as name, tddesc as description WHERE tdname NOT LIKE 'admin/%%' FROM %s";
+                               $query = "SELECT tdname as name, tddesc as description FROM %s WHERE tdname NOT LIKE 'admin/%%'";
                                $show  = array(
                                        'content' => 'shortnames'
                                );
@@ -4562,7 +4565,7 @@ class AdminActions extends BaseActions
                                                'expname'       => Entity::hsc($skinObj->sdname),
                                                'expdesc'       => Entity::hsc($skinObj->sddesc),
                                        );
-                                       echo TEMPLATE::fill($template, $data);
+                                       echo Template::fill($template, $data);
                                }
                                break;
                        case 'template':
@@ -4574,7 +4577,7 @@ class AdminActions extends BaseActions
                                                'expname'       => Entity::hsc($templateObj->tdname),
                                                'expdesc'       => Entity::hsc($templateObj->tddesc),
                                        );
-                                       echo TEMPLATE::fill($template, $data);
+                                       echo Template::fill($template, $data);
                                }
                                break;
                }
@@ -4591,7 +4594,7 @@ class AdminActions extends BaseActions
        public function parse_skinoverview($templateName = '')
        {
                global $CONF;
-               $query = "SELECT * FROM %s ORDER BY sdname";
+               $query = "SELECT * FROM %s WHERE sdincmode != 'admin' ORDER BY sdname";
                $query = sprintf($query, sql_table('skin_desc'));
                
                $template['content']  = 'skinlist';
@@ -4676,7 +4679,7 @@ class AdminActions extends BaseActions
                        {
                                $template['head'] = "<ul>\n";
                        }
-                       echo TEMPLATE::fill($template['head'], $data);
+                       echo Template::fill($template['head'], $data);
                        if ( array_key_exists('SPECIALSKINLIST_BODY', $templates) && !empty($templates['SPECIALSKINLIST_BODY']) )
                        {
                                $template['body'] = $templates['SPECIALSKINLIST_BODY'];
@@ -4695,7 +4698,7 @@ class AdminActions extends BaseActions
                                        'skinid'   => $skinid,
                                        'skintype' => Entity::hsc(strtolower($row['stype']))
                                );
-                               echo TEMPLATE::fill($template['body'], $data);
+                               echo Template::fill($template['body'], $data);
                        }
                        $data = array();
                        if (array_key_exists('SPECIALSKINLIST_FOOT', $templates) && !empty($templates['SPECIALSKINLIST_FOOT']) )
@@ -4706,7 +4709,7 @@ class AdminActions extends BaseActions
                        {
                                $template['foot'] = "</ul>\n";
                        }
-                       echo TEMPLATE::fill($template['foot'], $data);
+                       echo Template::fill($template['foot'], $data);
                        return;
                }
        }
@@ -4824,7 +4827,7 @@ class AdminActions extends BaseActions
                                                'key'   => $key,
                                                'value' => $value,
                                        );
-                                       echo TEMPLATE::fill($template, $data);
+                                       echo Template::fill($template, $data);
                                }
                                break;
                        case 'modrewrite':
@@ -5324,7 +5327,7 @@ class AdminActions extends BaseActions
        {
                $templates = array();
                if ($tplName) {
-                       $templates = skinableTEMPLATE::read($tplName);
+                       $templates = Template::read($tplName);
                }
                if (isset($templates['ADMIN_CUSTOMHELPLINK_ANCHOR']) && !empty($templates['ADMIN_CUSTOMHELPLINK_ANCHOR'])) {
                        $template = $templates['ADMIN_CUSTOMHELPLINK_ANCHOR'];
@@ -5348,7 +5351,7 @@ class AdminActions extends BaseActions
                                'onclick'    => $onclick,
                                'title'      => (isset($title) && !empty($title)) ? $title : _HELP_TT,
                );
-               return TEMPLATE::fill($template, $data);
+               return Template::fill($template, $data);
        }
        
        /**
@@ -5397,7 +5400,7 @@ class AdminActions extends BaseActions
                        'alt'           => (isset($alt) && !empty($alt))         ? $alt   : _HELP_TT,
                        'title'         => (isset($title) && !empty($title)) ? $title : _HELP_TT,
                );
-               $icon = TEMPLATE::fill($template, $data);
+               $icon = Template::fill($template, $data);
                $help = self::customHelplink($id, $tplName, $url, $title, $onclick);
                return $help . $icon;
        }
@@ -5494,7 +5497,7 @@ class AdminActions extends BaseActions
                }
                else
                {
-                       echo TEMPLATE::fill($template, $dat);
+                       echo Template::fill($template, $dat);
                }
                return;
        }

diff --git a/nucleus/libs/TEMPLATE.php b/nucleus/libs/TEMPLATE.php
index 70f923e..5849437 100644 (file)
--- a/nucleus/libs/TEMPLATE.php
+++ b/nucleus/libs/TEMPLATE.php
@@ -234,7 +234,7 @@ class Template
        }\r
        \r
        /**\r
-        * TEMPLATE::exists()\r
+        * Template::exists()\r
         * returns true if there is a template with the given shortname\r
         * \r
         * @static\r
@@ -250,7 +250,7 @@ class Template
        }\r
        \r
        /**\r
-        * TEMPLATE::existsID()\r
+        * Template::existsID()\r
         * returns true if there is a template with the given ID\r
         * \r
         * @static\r
@@ -266,7 +266,7 @@ class Template
        }\r
        \r
        /**\r
-        * TEMPLATE::getNameFromId()\r
+        * Template::getNameFromId()\r
         * \r
         * @static\r
         * @param       integer $id     id for template\r
@@ -280,7 +280,7 @@ class Template
        }\r
        \r
        /**\r
-        * TEMPLATE::getDesc()\r
+        * Template::getDesc()\r
         * \r
         * @static\r
         * @param       integer $id     id for template\r

diff --git a/nucleus/libs/showlist.php b/nucleus/libs/showlist.php
index f287d28..60d628e 100644 (file)
--- a/nucleus/libs/showlist.php
+++ b/nucleus/libs/showlist.php
@@ -19,7 +19,7 @@
 \r
 \r
 // can take either an array of objects, or an SQL query\r
-function showlist($query, $type, $template, $templateName = '')\r
+function showlist($query, $type, $vars, $templateName = '')\r
 {\r
        if ( is_array($query) )\r
        {\r
@@ -28,15 +28,15 @@ function showlist($query, $type, $template, $templateName = '')
                        return 0;\r
                }\r
                \r
-               call_user_func("listplug_{$type}", $template, 'HEAD', $templateName);\r
+               call_user_func("listplug_{$type}", $vars, 'HEAD', $templateName);\r
                \r
                foreach ( $query as $currentObj )\r
                {\r
-                       $template['current'] = $currentObj;\r
-                       call_user_func("listplug_{$type}", $template, 'BODY', $templateName);\r
+                       $vars['current'] = $currentObj;\r
+                       call_user_func("listplug_{$type}", $vars, 'BODY', $templateName);\r
                }\r
                \r
-               call_user_func("listplug_{$type}", $template, 'FOOT', $templateName);\r
+               call_user_func("listplug_{$type}", $vars, 'FOOT', $templateName);\r
                \r
                return sizeof($query);\r
        }\r
@@ -50,14 +50,14 @@ function showlist($query, $type, $template, $templateName = '')
                {\r
                        return 0;\r
                }\r
-               call_user_func("listplug_{$type}", $template, 'HEAD', $templateName);\r
+               call_user_func("listplug_{$type}", $vars, 'HEAD', $templateName);\r
                \r
-               while( $template['current'] = sql_fetch_object($res) )\r
+               while( $vars['current'] = sql_fetch_object($res) )\r
                {\r
-                       call_user_func("listplug_{$type}", $template, 'BODY', $templateName);\r
+                       call_user_func("listplug_{$type}", $vars, 'BODY', $templateName);\r
                }\r
                \r
-               call_user_func("listplug_{$type}", $template, 'FOOT', $templateName);\r
+               call_user_func("listplug_{$type}", $vars, 'FOOT', $templateName);\r
                \r
                sql_free_result($res);\r
                \r
@@ -1573,7 +1573,7 @@ function listplug_table_skinlist($vars, $type, $templateName = '')
                                for ( $i = 0; $i < sizeof($types); $i++ )\r
                                {\r
                                        $type = $types[$i];\r
-                                       if ( !array_key_exists($type, $template['friendly_names']) || $type == strtolower($template['friendly_names'][$type]) )\r
+                                       if ( !array_key_exists($type, $vars['friendly_names']) || $type == strtolower($vars['friendly_names'][$type]) )\r
                                        {\r
                                                $article = 'skinpartspecial';\r
                                        }\r
@@ -1583,8 +1583,8 @@ function listplug_table_skinlist($vars, $type, $templateName = '')
                                        }\r
                                        $types[$i]  = "<li>\n"\r
                                                                . helpHtml($article) . "\n"\r
-                                                   . "<a href=\"index.php?action=skinedittype&amp;skinid={$current->sdnumber}&amp;type={$type}\" tabindex=\"{$template['tabindex']}\">"\r
-                                                   . Entity::hsc($template['friendly_names'][$type])\r
+                                                   . "<a href=\"index.php?action=skinedittype&amp;skinid={$current->sdnumber}&amp;type={$type}\" tabindex=\"{$vars['tabindex']}\">"\r
+                                                   . Entity::hsc($vars['friendly_names'][$type])\r
                                                    . "</a>\n"\r
                                                    . "</li>\n";\r
                                }\r
@@ -1889,13 +1889,13 @@ function listplug_table_adminskinlist($vars, $type, $templateName = '')
                                . "<%readme%></td>\n"\r
                                . "<td class=\"availableSkinTypes\"><%skindesc%><%skinparts%></td>\n"\r
                                . "<td style=\"white-space:nowrap\">"\r
-                               . "<a href=\"index.php?action=skinedit&amp;skinid=<%skinid%>\" tabindex=\"<%tabindex%>\"><%editbtn%>"\r
+                               . "<a href=\"index.php?action=adminskinedit&amp;skinid=<%skinid%>\" tabindex=\"<%tabindex%>\"><%editbtn%>"\r
                                . "</a></td>\n"\r
                                . "<td style=\"white-space:nowrap\">"\r
                                . "<a href=\"<%cloneurl%>\" tabindex=\"<%tabindex%>\"><%clonebtn%>"\r
                                . "</a></td>\n"\r
                                . "<td style=\"white-space:nowrap\">"\r
-                               . "<a href=\"index.php?action=skindelete&amp;skinid=<%skinid%>\" tabindex=\"<%tabindex%>\"><%delbtn%>"\r
+                               . "<a href=\"index.php?action=adminskindelete&amp;skinid=<%skinid%>\" tabindex=\"<%tabindex%>\"><%delbtn%>"\r
                                . "</a></td>\n";\r
                        }\r
                        $url  = $manager->addTicketToUrl('index.php?action=adminskinclone&skinid=' . intval($current->sdnumber));\r
@@ -1969,7 +1969,7 @@ function listplug_table_adminskinlist($vars, $type, $templateName = '')
                                for ( $i = 0; $i < sizeof($types); $i++ )\r
                                {\r
                                        $type = $types[$i];\r
-                                       if ( !array_key_exists($type, $template['friendly_names']) || $type == strtolower($template['friendly_names'][$type]) )\r
+                                       if ( !array_key_exists($type, $vars['friendly_names']) || $type == strtolower($vars['friendly_names'][$type]) )\r
                                        {\r
                                                $article = 'skinpartspecial';\r
                                        }\r
@@ -1980,7 +1980,7 @@ function listplug_table_adminskinlist($vars, $type, $templateName = '')
                                        $types[$i]  = "<li>\n"\r
                                                    . helpHtml($article) . "\n"\r
                                                    . "<a href=\"index.php?action=adminskinedittype&amp;skinid={$current->sdnumber}&amp;type={$type}\" tabindex=\"{$vars['tabindex']}\">"\r
-                                                   . Entity::hsc($template['friendly_names'][$type])\r
+                                                   . Entity::hsc($vars['friendly_names'][$type])\r
                                                    . "</a>\n"\r
                                                    . "</li>\n";\r
                                }\r

diff --git a/nucleus/locales/adminskinTypes.php b/nucleus/locales/adminskinTypes.php
index 0a75979..671758b 100644 (file)
--- a/nucleus/locales/adminskinTypes.php
+++ b/nucleus/locales/adminskinTypes.php
@@ -20,6 +20,7 @@ define('_ADM_SKPRT_BATCHDELETE',                            '[' . _BATCH_DELETE_
 define('_ADM_SKPRT_BATCHITEM',                              '[' . _BATCH_ITEMS . ']' . _SKINABLEADMIN_PAGE_STR);\r
 define('_ADM_SKPRT_BATCHMEMBER',                            '[' . _BATCH_MEMBERS . ']' . _SKINABLEADMIN_PAGE_STR);\r
 define('_ADM_SKPRT_BATCHMOVE',                              '[' . _SKINABLEADMIN_BATCH_MOVE . ']' . _SKINABLEADMIN_PAGE_STR);\r
+define('_ADM_SKPRT_BATCHMOVECAT',                           '[' . _MOVECAT_TITLE . ']' . _SKINABLEADMIN_PAGE_STR);\r
 define('_ADM_SKPRT_BATCHTEAM',                              '[' . _BATCH_TEAM . ']' . _SKINABLEADMIN_PAGE_STR);\r
 define('_ADM_SKPRT_BLOGCOMMENTLIST',                        '[' . _COMMENTS_BLOG . ']' . _SKINABLEADMIN_PAGE_STR);\r
 define('_ADM_SKPRT_BLOGSETTINGS',                           '[' . _EBLOG_TITLE . ']' . _SKINABLEADMIN_PAGE_STR);\r

diff --git a/nucleus/xmlrpc/server.php b/nucleus/xmlrpc/server.php
index f9b0a44..1633b3e 100644 (file)
--- a/nucleus/xmlrpc/server.php
+++ b/nucleus/xmlrpc/server.php
@@ -269,7 +269,7 @@ function _getSkinPart($blogid, $username, $password, $type) {
        // 3. return skin part
        $blog = new Blog($blogid);
        $skin = new SKIN($blog->getDefaultSkin());
-       return new xmlrpcresp(new xmlrpcval($skin->getContent($type),"string"));
+       return new xmlrpcresp(new xmlrpcval($skin->getContentFromDB($type),"string"));
 
 }