MERGE: リビジョン1863。Actions::ifCategory()の条件式を結合

SQLクエリの発行回数を減らすため

Revision 1863:
CHANGE: concatinate if condition in Actions::ifCategory()
For reducing needless SQL querying.
http://nucleuscms.svn.sourceforge.net/viewvc/nucleuscms?view=revision&revision=1863

diff --git a/nucleus/libs/ACTIONS.php b/nucleus/libs/ACTIONS.php
index 243c06c..15ea24c 100644 (file)
--- a/nucleus/libs/ACTIONS.php
+++ b/nucleus/libs/ACTIONS.php
@@ -15,7 +15,7 @@
  *\r
  * @license http://nucleuscms.org/license.txt GNU General Public License\r
  * @copyright Copyright (C) 2002-2012 The Nucleus Group\r
- * @version $Id: ACTIONS.php 1784 2012-04-22 04:28:30Z sakamocchi $\r
+ * @version $Id: ACTIONS.php 1863 2012-05-19 10:50:27Z sakamocchi $
  */\r
 \r
 class Actions extends BaseActions\r
@@ -427,7 +427,7 @@ class Actions extends BaseActions
                }\r
                \r
                // check category name\r
-               if ( $name == 'catname' )\r
+               else if ( $name == 'catname' )
                {\r
                        $value = $blog->getCategoryIdFromName($value);\r
                        if ( $value == $catid )\r
@@ -437,7 +437,7 @@ class Actions extends BaseActions
                }\r
                \r
                // check category id\r
-               if ( ($name == 'catid') && ($value == $catid) )\r
+               else if ( ($name == 'catid') && ($value == $catid) )
                {\r
                        return $blog->isValidCategory($catid);\r
                }\r