got rid of =& when constructing objects
This commit is contained in:
parent
0d9129d16c
commit
ea288cb362
|
@ -17,7 +17,7 @@ require_once "$storageServerPath/var/Prefs.php";
|
||||||
PEAR::setErrorHandling(PEAR_ERROR_RETURN);
|
PEAR::setErrorHandling(PEAR_ERROR_RETURN);
|
||||||
$dbc = DB::connect($config['dsn'], TRUE);
|
$dbc = DB::connect($config['dsn'], TRUE);
|
||||||
$dbc->setFetchMode(DB_FETCHMODE_ASSOC);
|
$dbc->setFetchMode(DB_FETCHMODE_ASSOC);
|
||||||
$bs = &new BasicStor($dbc, $config);
|
$bs = new BasicStor($dbc, $config);
|
||||||
|
|
||||||
$stid = $bs->storId;
|
$stid = $bs->storId;
|
||||||
#var_dump($stid); exit;
|
#var_dump($stid); exit;
|
||||||
|
@ -156,7 +156,7 @@ function admDumpSubjects(&$bs, $ind=''){
|
||||||
|
|
||||||
function admDumpPrefs(&$bs, $subjid){
|
function admDumpPrefs(&$bs, $subjid){
|
||||||
$res ='';
|
$res ='';
|
||||||
$pr =& new Prefs($bs);
|
$pr = new Prefs($bs);
|
||||||
$prefkeys = $pr->readKeys($subjid);
|
$prefkeys = $pr->readKeys($subjid);
|
||||||
# var_dump($subjid); var_dump($prefkeys); #exit;
|
# var_dump($subjid); var_dump($prefkeys); #exit;
|
||||||
foreach($prefkeys as $i =>$prefk){
|
foreach($prefkeys as $i =>$prefk){
|
||||||
|
|
|
@ -24,7 +24,7 @@ if (PEAR::isError($dbc)) {
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
$dbc->setFetchMode(DB_FETCHMODE_ASSOC);
|
$dbc->setFetchMode(DB_FETCHMODE_ASSOC);
|
||||||
$gb =& new GreenBox($dbc, $config);
|
$gb = new GreenBox($dbc, $config);
|
||||||
|
|
||||||
$testonly = (isset($argv[1]) && $argv[1] == '-t');
|
$testonly = (isset($argv[1]) && $argv[1] == '-t');
|
||||||
|
|
||||||
|
|
|
@ -84,15 +84,15 @@ function ls_restore_restoreObject($obj, $parid, $reallyInsert=TRUE){
|
||||||
PEAR::setErrorHandling(PEAR_ERROR_RETURN);
|
PEAR::setErrorHandling(PEAR_ERROR_RETURN);
|
||||||
$dbc = DB::connect($config['dsn'], TRUE);
|
$dbc = DB::connect($config['dsn'], TRUE);
|
||||||
$dbc->setFetchMode(DB_FETCHMODE_ASSOC);
|
$dbc->setFetchMode(DB_FETCHMODE_ASSOC);
|
||||||
$bs = &new BasicStor($dbc, $config);
|
$bs = new BasicStor($dbc, $config);
|
||||||
$pr =& new Prefs($bs);
|
$pr = new Prefs($bs);
|
||||||
|
|
||||||
$dbxml = file_get_contents($argv[1]);
|
$dbxml = file_get_contents($argv[1]);
|
||||||
$tmpdir = $argv[2];
|
$tmpdir = $argv[2];
|
||||||
|
|
||||||
require_once"$storageServerPath/var/XmlParser.php";
|
require_once("$storageServerPath/var/XmlParser.php");
|
||||||
$parser =& new XmlParser($dbxml);
|
$parser = new XmlParser($dbxml);
|
||||||
if($parser->isError()){
|
if ($parser->isError()) {
|
||||||
return PEAR::raiseError(
|
return PEAR::raiseError(
|
||||||
"MetaData::parse: ".$parser->getError()
|
"MetaData::parse: ".$parser->getError()
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in New Issue