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

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

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index ede00be..7651600 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -1620,12 +1620,15 @@ class AdminActions extends BaseActions
                $itemid = intRequestVar('itemid');
                $item =& $manager->getItem($itemid, 1, 1);
                
-               $blog =& $manager->getBlog(getBlogIDFromItemID($itemid));
-               
-               if ( $item && $blog->convertBreaks() && requestVar('action') == 'itemedit' )
+               if ( $item )
                {
-                       $item['body'] = removeBreaks($item['body']);
-                       $item['more'] = removeBreaks($item['more']);
+                       $blog =& $manager->getBlog($item['blogid']);
+                       
+                       if ( $blog->convertBreaks() && requestVar('action') == 'itemedit' )
+                       {
+                               $item['body'] = removeBreaks($item['body']);
+                               $item['more'] = removeBreaks($item['more']);
+                       }
                }
                
                $contents = array();
@@ -1695,9 +1698,9 @@ class AdminActions extends BaseActions
                        }
                }
                $query = 'SELECT cbody, cuser, cmail, cemail, mname, ctime, chost, cnumber, cip, citem '
-               . 'FROM %s '
-               . 'LEFT OUTER JOIN %s ON  mnumber=cmember '
-               . 'WHERE ';
+                      . 'FROM %s '
+                      . 'LEFT OUTER JOIN %s ON  mnumber=cmember '
+                      . 'WHERE ';
                $query = sprintf($query, sql_table('comment'), sql_table('member'));
                
                if ( $this->skintype == 'itemcommentlist' )
@@ -3295,12 +3298,15 @@ class AdminActions extends BaseActions
                $itemid = intRequestVar('itemid');
                $item =& $manager->getItem($itemid, 1, 1);
                
-               $blog   =& $manager->getBlog(getBlogIDFromItemID($itemid));
-               
-               if ( $item && $blog->convertBreaks() && requestVar('action') == 'itemedit' )
+               if ( $item )
                {
-                       $item['body'] = removeBreaks($item['body']);
-                       $item['more'] = removeBreaks($item['more']);
+                       $blog =& $manager->getBlog($item['blogid']);
+                       
+                       if ( $blog->convertBreaks() && requestVar('action') == 'itemedit' )
+                       {
+                               $item['body'] = removeBreaks($item['body']);
+                               $item['more'] = removeBreaks($item['more']);
+                       }
                }
                
                $contents = array();
@@ -5463,4 +5469,4 @@ class AdminActions extends BaseActions
                echo "</select>\n";
                return;
        }
-}
\ No newline at end of file
+}