MERGE: リビジョン1791。Blog/CommentActionsクラスの差分のマージ

以下の2つのコミットを上流に反映した際の差分のマージ。
commit: f51cf34038f7394f469ef0c2d2fc8c6eec89f47f
commit: 4c5e7bd7ef24aadd49c80f8755d3914c0d32d6e0

Revision 1791:
fix minor bugs in Blog and CommentActions class

Blog::addTeamMember()
CommentActions::parse_time()

diff --git a/nucleus/libs/BLOG.php b/nucleus/libs/BLOG.php
index c0e33f0..f6932ac 100644 (file)
--- a/nucleus/libs/BLOG.php
+++ b/nucleus/libs/BLOG.php
@@ -1384,10 +1384,10 @@ class Blog
                );\r
                \r
                // add to team\r
-               $query = 'INSERT INTO %s (TMEMBER, TBLOG, TADMIN) VALUES (%d, %d, %d)';\r
-               $query = sprintf($query, sql_table('team'), $memberid, $this->getID(), $admin);\r
+               $query = "INSERT INTO %s (TMEMBER, TBLOG, TADMIN) VALUES (%d, %d, %d);";
+               $query = sprintf($query, sql_table('team'), (integer) $memberid, (integer) $this->getID(), (integer) $admin);
                DB::execute($query);\r
-\r
+               \r
                $manager->notify(\r
                        'PostAddTeamMember',\r
                        array(\r

diff --git a/nucleus/libs/COMMENTACTIONS.php b/nucleus/libs/COMMENTACTIONS.php
index 22cc3cf..ce592ec 100644 (file)
--- a/nucleus/libs/COMMENTACTIONS.php
+++ b/nucleus/libs/COMMENTACTIONS.php
@@ -695,7 +695,7 @@ class CommentActions extends BaseActions
        }
        
        /**
-        * ItemActions::checkCondition()
+        * CommentActions::checkCondition()
         * Checks conditions for if statements
         *
         * @param       string  $field  type of <%if%>