Merge branch 'skinnable-master'

[nucleus-jp/nucleus-next.git] / nucleus / convert / livejournal.php

diff --git a/nucleus/convert/livejournal.php b/nucleus/convert/livejournal.php
index e2972ab..b2324ce 100644 (file)
--- a/nucleus/convert/livejournal.php
+++ b/nucleus/convert/livejournal.php
@@ -22,7 +22,7 @@
  *
  * @license http://nucleuscms.org/license.txt GNU General Public License
  * @copyright Copyright (C) 2002-2006 The Nucleus Group
- * @version $Id: livejournal.php 1624 2012-01-09 11:36:20Z sakamocchi $
+ * @version $Id: livejournal.php 1889 2012-06-17 08:46:45Z sakamocchi $
  */
 
 include("../../config.php");
@@ -157,7 +157,7 @@ function bc_assignMembers() {
                                   . " FROM ".sql_table('member');
 
                        $template['name'] = 'memberid[' . $idx . ']';
-                       showlist($query,'select',$template);
+                       echo showlist($query,'select',$template);
                ?>
                        </td>
                        <td>
@@ -187,7 +187,7 @@ function bc_assignMembers() {
                                                   . " FROM ".sql_table('blog');
                                        $template['name'] = 'blogid';
                                        $template['selected'] = $CONF['DefaultBlog'];
-                                       showlist($query,'select',$template);
+                                       echo showlist($query,'select',$template);
                        ?>
                </div>
                <div>
@@ -200,7 +200,7 @@ function bc_assignMembers() {
                                                   . " FROM ".sql_table('member');
 
                                        $template['name'] = 'newowner';
-                                       showlist($query,'select',$template);
+                                       echo showlist($query,'select',$template);
                                ?>
                                </li>
                        </ul>
@@ -226,7 +226,7 @@ function bc_assignMembers() {
 
 
 function bc_doConversion() {
-       global $HTTP_POST_VARS;
+       global $HTTP_POST_VARS, $manager;
 
        // 1. get all data
        $authorcount = intval($HTTP_POST_VARS['authorcount']);
@@ -290,7 +290,7 @@ function bc_doConversion() {
        }
 
        // add authors to blog team
-       $b = new Blog($nucleus_blogid);
+       $b =& $manager->getBlog($nucleus_blogid);
        global $catid;
        $catid = $b->getDefaultCategory();