X-Git-Url: http://git.osdn.net/view?p=nucleus-jp%2Fnucleus-next.git;a=blobdiff_plain;f=nucleus%2Fupgrades%2Fupgrade1.1.php;h=f324ea2e3e350d954133a87e7abd027dbb4c395b;hp=4c738696b5c40dcdb3047fe3d52e11358284853e;hb=e547917b5297010bfdd2809d1e531a3758175f93;hpb=d9398defb8c30d137b0c2f5d00d5b4e274b71d49

diff --git a/nucleus/upgrades/upgrade1.1.php b/nucleus/upgrades/upgrade1.1.php
index 4c73869..f324ea2 100644
--- a/nucleus/upgrades/upgrade1.1.php
+++ b/nucleus/upgrades/upgrade1.1.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
- * Copyright (C) 2002-2009 The Nucleus Group
+ * Copyright (C) 2002-2012 The Nucleus Group
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -11,7 +11,7 @@
  */
 /**
  * @license http://nucleuscms.org/license.txt GNU General Public License
- * @copyright Copyright (C) 2002-2009 The Nucleus Group
+ * @copyright Copyright (C) 2002-2012 The Nucleus Group
  * @version $Id: upgrade1.1.php 1809 2012-05-01 14:48:30Z sakamocchi $
  */
 
@@ -71,9 +71,9 @@ function upgrade_do110() {
 		// 4. add 'general' categories for all blogs, and update nucleus_item
 		$catid = 1;	// generate catids ourself
 		$query = 'SELECT bnumber FROM '.sql_table('blog');
-		$res = DB::getResult($query);
-		foreach ( $res as $current ) {
-			$blogid = $current['bnumber'];
+		$res = mysql_query($query);
+		while ($current = mysql_fetch_object($res)) {
+			$blogid = $current->bnumber;
 			
 			$query = 'INSERT INTO '.sql_table('category')." (catid, cblog, cname, cdesc) VALUES ($catid, $blogid, 'General', 'Items that do not fit in other categories')";
 			$r = upgrade_query("Adding category 'general' for blog " . $blogid, $query);
@@ -92,9 +92,9 @@ function upgrade_do110() {
 		
 		// 5. add template parts for category lists to all templates
 		$query = 'SELECT tdnumber FROM '.sql_table('template_desc');
-		$res = DB::getResult($query);	// get all template ids
-		foreach ( $res as $row ) {
-			$tid = $row['tdnumber']; 	// template id
+		$res = sql_query($query);	// get all template ids
+		while ($obj = mysql_fetch_object($res)) {
+			$tid = $obj->tdnumber; 	// template id
 		
 			$query = 'INSERT INTO '.sql_table('template')." VALUES ($tid, 'CATLIST_HEADER', '<ul><li><a href=\"<%blogurl%>\">All</a></li>');";
 			$query2 = 'INSERT INTO '.sql_table('template')." VALUES ($tid, 'CATLIST_LISTITEM', '<li><a href=\"<%catlink%>\"><%catname%></a></li>');";