MERGE: リビジョン1782。checkCondition()のアクセス修飾子をprotectedに変更。

BaseActionsクラスの派生クラスは、if/else/elseif/ifnot/elseifnot/endifの各タグを処理する際checkCondition()を用いる。この際、BaseActionsクラスがこのメソッドを呼ぶため、protectedとする必要がある。なおこのメソッドはダイレクトに用いるようなものではないため、publicは好ましくない。

Revision 1782:
Change: access modifier for checkCondition() in each class is now
protected
checkCondition is called from BaseActions. The access modifier should be
'protected'.
http://nucleuscms.svn.sourceforge.net/viewvc/nucleuscms?view=revision&revision=1782

diff --git a/nucleus/libs/ACTIONS.php b/nucleus/libs/ACTIONS.php
index 0eb88f0..3c86a8e 100644 (file)
--- a/nucleus/libs/ACTIONS.php
+++ b/nucleus/libs/ACTIONS.php
@@ -327,7 +327,7 @@ class Actions extends BaseActions
         * @param       string  $value  value of property\r
         * @return      boolean condition\r
         */\r
-       public function checkCondition($field, $name='', $value = '')\r
+       protected function checkCondition($field, $name='', $value = '')\r
        {\r
                global $catid, $blog, $member, $itemidnext, $itemidprev, $manager, $archiveprevexists, $archivenextexists;\r
                \r

diff --git a/nucleus/libs/BODYACTIONS.php b/nucleus/libs/BODYACTIONS.php
index fc93e82..e12d9f0 100644 (file)
--- a/nucleus/libs/BODYACTIONS.php
+++ b/nucleus/libs/BODYACTIONS.php
@@ -264,7 +264,7 @@ class BodyActions extends BaseActions
         * @param       string  $value  value of property\r
         * @return      condition\r
         */\r
-       public function checkCondition($field, $name='', $value = '')\r
+       protected function checkCondition($field, $name='', $value = '')\r
        {\r
                global $catid, $blog, $member, $itemidnext, $itemidprev, $manager, $archiveprevexists, $archivenextexists;\r
                \r

diff --git a/nucleus/libs/COMMENTACTIONS.php b/nucleus/libs/COMMENTACTIONS.php
index 410b2f5..3a54cf6 100644 (file)
--- a/nucleus/libs/COMMENTACTIONS.php
+++ b/nucleus/libs/COMMENTACTIONS.php
@@ -703,7 +703,7 @@ class CommentActions extends BaseActions
         * @param       string  $value  value of property\r
         * @return      boolean\r
         */\r
-       private function checkCondition($field, $name='', $value = '') {\r
+       protected function checkCondition($field, $name='', $value = '') {\r
                global $catid, $blog, $member, $itemidnext, $itemidprev, $manager, $archiveprevexists, $archivenextexists;\r
                $condition = 0;\r
                switch ( $field )\r

diff --git a/nucleus/libs/ITEMACTIONS.php b/nucleus/libs/ITEMACTIONS.php
index cfce878..8109137 100644 (file)
--- a/nucleus/libs/ITEMACTIONS.php
+++ b/nucleus/libs/ITEMACTIONS.php
@@ -845,7 +845,7 @@ class ItemActions extends BaseActions
         * @param       string  $value  value of property\r
         * @return      boolean\r
         */\r
-       private function checkCondition($field, $name='', $value = '')\r
+       protected function checkCondition($field, $name='', $value = '')\r
        {\r
                global $catid, $blog, $member, $itemidnext, $itemidprev, $manager, $archiveprevexists, $archivenextexists;\r
                \r