MERGE: リビジョン1735のマージ。Skin/TemplateクラスのSQL文バグ修正。

Revision 1735: minor bug fixes for Skin/Template class
http://nucleuscms.svn.sourceforge.net/viewvc/nucleuscms?view=revision&revision=1735

diff --git a/nucleus/libs/SKIN.php b/nucleus/libs/SKIN.php
index e78043a..c602467 100644 (file)
--- a/nucleus/libs/SKIN.php
+++ b/nucleus/libs/SKIN.php
@@ -167,7 +167,7 @@ class Skin
         */\r
        static public function exists($name)\r
        {\r
-               $query = "SELECT COUNT (*) AS result FROM %s WHERE sdname='%s';";\r
+               $query = "SELECT COUNT(*) AS result FROM %s WHERE sdname='%s';";\r
                $query = sprintf($query, sql_table('skin_desc'), sql_real_escape_string($name));\r
                return quickQuery($query) > 0;\r
        }\r

diff --git a/nucleus/libs/TEMPLATE.php b/nucleus/libs/TEMPLATE.php
index 8a7a38a..2bab2e4 100644 (file)
--- a/nucleus/libs/TEMPLATE.php
+++ b/nucleus/libs/TEMPLATE.php
@@ -243,8 +243,9 @@ class Template
        static public function exists($name)\r
        {\r
                $query = "SELECT * FROM %s WHERE tdname='%s';";\r
-               $r = sql_query($query, sql_table('template_desc'), sql_real_escape_string($name));\r
-               return (sql_num_rows($r) != 0);\r
+               $query = sql_query($query, sql_table('template_desc'), sql_real_escape_string($name));\r
+               $result = sql_query($query);\r
+               return (sql_num_rows($result) != 0);\r
        }\r
        \r
        /**\r