Merge branch 'master' into skinnable-master

diff --cc nucleus/libs/SKIN.php
index f900cd1,c602467..eb50c97
--- 1/nucleus/libs/SKIN.php
--- 2/nucleus/libs/SKIN.php
+++ b/nucleus/libs/SKIN.php
@@@ -200,9 -167,9 +200,9 @@@ class Ski
         */\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
 +              return (quickQuery($query) > 0);\r
        }\r
        \r
        /**\r