FIX: 通常用/管理画面用のスキン/テンプレートの作成・編集・複製・削除が正常に行われるよう修正

diff --git a/nucleus/libs/ADMIN.php b/nucleus/libs/ADMIN.php
index 3426a5a..87e60a4 100644 (file)
--- a/nucleus/libs/ADMIN.php
+++ b/nucleus/libs/ADMIN.php
@@ -3077,8 +3077,8 @@ class Admin
                sql_query($query);\r
                \r
                // 2. Update description\r
-               $query = "UPDATE %s SET tdname='%s',tddesc='%s' WHERE tdnumber=%d;";\r
-               $query = sprintf($query, sql_real_escape_string($name), sql_real_escape_string($desc), (integer) $templateid);\r
+               $query = "UPDATE %s SET tdname='%s', tddesc='%s' WHERE tdnumber=%d;";\r
+               $query = sprintf($query, sql_table('template_desc'), sql_real_escape_string($name), sql_real_escape_string($desc), (integer) $templateid);\r
                sql_query($query);\r
                \r
                // 3. Add non-empty template parts\r
@@ -3356,12 +3356,12 @@ class Admin
                \r
                // 1. Remove all template parts\r
                $query = "DELETE FROM %s WHERE tdesc=%d;";\r
-               $query = sprintf($query, (integer) $templateid);\r
+               $query = sprintf($query, sql_table('template'), (integer) $templateid);\r
                sql_query($query);\r
                \r
                // 2. Update description\r
-               $query = 'UPDATE %s SET tdname=%s tddesc=%s WHERE tdnumber=%d;';\r
-               $query = sprintf($query, sql_real_escape_string($name), sql_real_escape_string($desc), (integer) $templateid);\r
+               $query = "UPDATE %s SET tdname='%s', tddesc='%s' WHERE tdnumber=%d;";\r
+               $query = sprintf($query, sql_table('template_desc'), sql_real_escape_string($name), sql_real_escape_string($desc), (integer) $templateid);\r
                sql_query($query);\r
                \r
                // 3. Add non-empty template parts\r
@@ -3502,8 +3502,8 @@ class Admin
                        return -1;\r
                }\r
                \r
-               $query = "INSERT INTO (tdesc, tpartname, tcontent ) VALUES (%d, '%s', '%s');";\r
-               $query = sprintf($query, sql_table('template'), (integer) $id, sql_real_escape_string($partname), sql_real_escape_string($contents));\r
+               $query = "INSERT INTO %s (tdesc, tpartname, tcontent ) VALUES (%d, '%s', '%s');";\r
+               $query = sprintf($query, sql_table('template'), (integer) $id, sql_real_escape_string($partname), sql_real_escape_string($content));\r
                sql_query($query) or exit(_ADMIN_SQLDIE_QUERYERROR . sql_error());\r
                return sql_insert_id();\r
        }\r
@@ -4010,7 +4010,7 @@ class Admin
                $res = sql_query($query);\r
                while ( $row = sql_fetch_assoc($res) )\r
                {\r
-                       self::$skinclonetype($skin, $newid, $row['stype']);\r
+                       self::skinclonetype($skin, $newid, $row['stype']);\r
                }\r
                \r
                self::action_skinoverview();\r
@@ -4028,7 +4028,7 @@ class Admin
        static private function skinclonetype($skin, $newid, $type)\r
        {\r
                $newid = intval($newid);\r
-               $content = $skin->getContent($type);\r
+               $content = $skin->getContentFromDB($type);\r
                \r
                if ( $content )\r
                {\r

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index 41578ff..13acc5d 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -3021,7 +3021,7 @@ class AdminActions extends BaseActions
         * @param       string  $tplt                   name of template
         * @return      boolean 
         */
-       public function parse_edittemplateinfo($type, $description = '', $name = '', $help = '', $tabindex = 0, $big = 0, $tplt = '')
+       public function parse_edittemplateinfo($type, $desc = '', $name = '', $help = '', $tabindex = 0, $big = 0, $tplt = '')
        {
                global $manager;