Merge branch 'skinnable-master' of sakamocchi@git.sourceforge.jp:/gitroot/nucleus...

[nucleus-jp/nucleus-next.git] / nucleus / libs / BLOG.php

diff --git a/nucleus/libs/BLOG.php b/nucleus/libs/BLOG.php
index 82ee9dd..faf5bbe 100644 (file)
--- a/nucleus/libs/BLOG.php
+++ b/nucleus/libs/BLOG.php
@@ -25,18 +25,18 @@ require_once dirname(__FILE__) . '/ITEMACTIONS.php';
 class Blog\r
 {\r
        // blog id\r
-       var $blogid;\r
-\r
-       // ID of currently selected category\r
-       var $selectedcatid;\r
-\r
+       public $blogid;\r
+       \r
        // After creating an object of the blog class, contains true if the BLOG object is\r
        // valid (the blog exists)\r
-       var $isValid;\r
-\r
+       public $isValid;\r
+       \r
        // associative array, containing all blogsettings (use the get/set functions instead)\r
-       var $settings;\r
-\r
+       private $settings;\r
+       \r
+       // ID of currently selected category\r
+       private $selectedcatid;\r
+       \r
        /**\r
         * Blog::_\construct()\r
         * Creates a new BLOG object for the given blog\r
@@ -874,9 +874,9 @@ class Blog
                        else\r
                        {\r
                                global $itemid;\r
-                               if ( intval($itemid) && $manager->existsItem(intval($itemid), 0, 0) )\r
+                               if ( (integer) $itemid && $manager->existsItem((integer) $itemid, 0, 0) )\r
                                {\r
-                                       $iobj   =& $manager->getItem(intval($itemid), 0, 0);\r
+                                       $iobj   =& $manager->getItem($itemid, 0, 0);\r
                                        $cid    = $iobj['catid'];\r
                                        \r
                                        if ( $cid == $data['catid'] )\r
@@ -1184,11 +1184,11 @@ class Blog
                \r
                if ( !$this->convertBreaks() )\r
                {\r
-                       echo "setConvertBreaks(FALSE):\n";\r
+                       echo "setConvertBreaks(false);\n";\r
                }\r
                else\r
                {\r
-                       echo "setConvertBreaks(TRUE):\n";\r
+                       echo "setConvertBreaks(true);\n";\r
                }\r
                echo "setMediaUrl('{$CONF['MediaURL']}');\n";\r
                echo "setAuthorId('{$authorid}');\n";\r
@@ -1647,7 +1647,7 @@ class Blog
                $admin = intval($admin);\r
                \r
                // check if member is already a member\r
-               $tmem = Member::createFromID($memberid);\r
+               $tmem =& $manager->getMember($memberid);\r
                \r
                if ( $tmem->isTeamMember($this->blogid) )\r
                {\r