FIX: ウェブログの設定画面におけるバグを修正

以下の２つを修正
1. 「Blogの標準のスキン」リストが表示されないバグ
2. 「カテゴリー」のリストでcatcblogidがオブジェクトメンバーにないバグ

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index a347b25..0394862 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -132,12 +132,12 @@ class AdminActions extends BaseActions
         */
        static private $default_actions = array(
                'addtickettourl',
+               'adminurl',
+               'customhelplink',
                'headmessage',
-               'ticket',
-               'sprinttext',
                'helplink',
-               'customhelplink',
-               'adminurl'
+               'sprinttext',
+               'ticket'
        );
        
        /**
@@ -471,16 +471,17 @@ class AdminActions extends BaseActions
                        case 'blogsettings':
                                $extra_actions = array(
                                        'adminbloglink',
-                                       'blogteammembers',
-                                       'requestblogid',
-                                       'blogsetting',
+                                       'blogcatlist',
                                        'blognotifysetting',
-                                       'defcatselect',
-                                       'blogtime',
+                                       'blogsetting',
                                        'blogsettingyesno',
-                                       'pluginoptions',
-                                       'blogcatlist',
+                                       'blogteammembers',
+                                       'blogtime',
+                                       'defcatselect',
+                                       'defskinselect',
                                        'pluginextras',
+                                       'pluginoptions',
+                                       'requestblogid',
                                );
                                break;
                        case 'bookmarklet':
@@ -509,6 +510,7 @@ class AdminActions extends BaseActions
                                        'requestblogid',
                                        'categorysetting',
                                        'editdesturl',
+                                       'pluginoptions'
                                );
                                break;
                        case 'commentdelete':
@@ -2027,7 +2029,7 @@ class AdminActions extends BaseActions
                $res    = sql_query($query);
                $obj    = sql_fetch_object($res);
                
-               if ( $type != desc )
+               if ( $type != 'name' )
                {
                        echo Entity::hsc($obj->cdesc);
                }
@@ -2471,16 +2473,15 @@ class AdminActions extends BaseActions
         */
        public function parse_defskinselect($type = 'blog', $templateName = '')
        {
-               global $manager;
+               global $CONF, $manager;
                
-               $query  = "SELECT sdname as text, sdnumber as value FROM %s;";
+               $query  = "SELECT sdname as text, sdnumber as value FROM %s WHERE sdname NOT LIKE 'admin/%%';";
                $query = sprintf($query, sql_table('skin_desc'));
                
                $blogid = intRequestVar('blogid');
                
                if ( !$blogid )
                {
-                       global $CONF;
                        $template['selected'] = $CONF['BaseSkin'];
                }
                else

diff --git a/nucleus/libs/showlist.php b/nucleus/libs/showlist.php
index a316644..4866106 100644 (file)
--- a/nucleus/libs/showlist.php
+++ b/nucleus/libs/showlist.php
@@ -1414,7 +1414,7 @@ function listplug_table_categorylist($vars, $type, $templateName = '')
                                'catid'         => intval($current->catid),\r
                                'catname'       => Entity::hsc($current->cname),\r
                                'catdesc'       => Entity::hsc($current->cdesc),\r
-                               'blogid'        => intval($current->catcblogid),\r
+                               'blogid'        => intval($current->cblog),\r
                                'tabindex'      => intval($vars['tabindex']),\r
                                'editbtn'       => _LISTS_EDIT,\r
                                'delbtn'        => _LISTS_DELETE,\r