Remove superfluous result object

This commit is contained in:
Miles Lott 2001-02-13 00:08:15 +00:00
parent e0cb096281
commit a74a6539f7

View File

@ -1,4 +1,16 @@
<? <?
/**************************************************************************\
* phpGroupWare - Setup *
* http://www.phpgroupware.org *
* -------------------------------------------- *
* This program is free software; you can redistribute it and/or modify it *
* under the terms of the GNU General Public License as published by the *
* Free Software Foundation; either version 2 of the License, or (at your *
* option) any later version. *
\**************************************************************************/
/* $Id$ */
function upgrade_addressbook { function upgrade_addressbook {
global $phpgw_info, $phpgw_setup; global $phpgw_info, $phpgw_setup;
@ -75,9 +87,8 @@
// read in old addressbook // read in old addressbook
$phpgw_setup->db->query("select * from addressbook"); $phpgw_setup->db->query("select * from addressbook");
// create a couple of extra db objects for the two nested queries below // create an extra db objects for the two nested queries below
$db2 = $phpgw_setup->db; $db2 = $phpgw_setup->db;
$db3 = $phpgw_setup->db;
while ( $phpgw_setup->db->nextrecord() ) { while ( $phpgw_setup->db->nextrecord() ) {
$fields["org_name"] = $phpgw->db->f("ab_company"); $fields["org_name"] = $phpgw->db->f("ab_company");
@ -126,7 +137,7 @@
// insert extra data for this record into extra fields table // insert extra data for this record into extra fields table
while (list($name,$value) = each($extra)) { while (list($name,$value) = each($extra)) {
$phpgw_setup->db3->query("INSERT INTO phpgw_addressbook_extra VALUES ('$id','" . $$fields["owner"] . "','" $phpgw_setup->db2->query("INSERT INTO phpgw_addressbook_extra VALUES ('$id','" . $$fields["owner"] . "','"
. addslashes($name) . "','" . addslashes($value) . "')",__LINE__,__FILE__); . addslashes($name) . "','" . addslashes($value) . "')",__LINE__,__FILE__);
} }
} }