Index: trunk/kernel/include/config.php
===================================================================
diff -u -N -r369 -r534
--- trunk/kernel/include/config.php	(.../config.php)	(revision 369)
+++ trunk/kernel/include/config.php	(.../config.php)	(revision 534)
@@ -13,7 +13,7 @@
 	function clsConfig()
 	{
 	  $this->m_IsDirty=false;
-      $this->adodbConnection = GetADODBConnection();
+      $this->adodbConnection = &GetADODBConnection();
 	  $this->config = array();
 	  $this->m_IsDefault = array();
 	  $this->VarType = array();
@@ -186,7 +186,7 @@
   
   function clsConfigAdminItem($config_name=NULL)
   {   
-      $this->adodbConnection = GetADODBConnection();
+      $this->adodbConnection = &GetADODBConnection();
       if($config_name)
           $this->LoadSetting($config_name);
   }
@@ -418,7 +418,7 @@
                   WHERE ModuleOwner='".$this->module."' AND Section='".$this->section."' AND Install=1 ORDER BY DisplayOrder ASC";
       }
 	  if( $GLOBALS['debuglevel'] ) echo $sql."<br>\n"; 
-      $adodbConnection = GetADODBConnection();
+      $adodbConnection = &GetADODBConnection();
       $rs = $adodbConnection->Execute($sql);
       while($rs && !$rs->EOF)
       {
Index: trunk/admin/install.php
===================================================================
diff -u -N -r478 -r534
--- trunk/admin/install.php	(.../install.php)	(revision 478)
+++ trunk/admin/install.php	(.../install.php)	(revision 534)
@@ -248,7 +248,7 @@
 
 if(strlen($state)==0)
 {
-    $ado =& inst_GetADODBConnection();
+    $ado =& inst_&GetADODBConnection();
     $installed = $ado ? TableExists($ado,"ConfigurationAdmin,Category,Permissions") : false;
     
     if(!minimum_php_version("4.1.2"))
@@ -326,7 +326,7 @@
       $LoggedIn = FALSE;
       if($_POST["UserName"]=="root") 
       {
-          $ado =& inst_GetADODBConnection();
+          $ado =& inst_&GetADODBConnection();
           $sql = "SELECT * FROM ".$g_TablePrefix."ConfigurationValues WHERE VariableName='RootPass'";
           
           $rs = $ado->Execute($sql);
@@ -383,7 +383,7 @@
 	          case 1:
 	              /* clean out all tables */
 	              $install_type = 4;
-	              $ado =& inst_GetADODBConnection();
+	              $ado =& inst_&GetADODBConnection();
 	              $filename = $pathtoroot.$admin."/install/inportal_remove.sql";  
 	              RunSchemaFile($ado,$filename);
 	              /* run install again */
@@ -400,7 +400,7 @@
 	          case 4:
 	          		$install_type = 6;
 	              /* clean out all tables */
-	              $ado =& inst_GetADODBConnection();
+	              $ado =& inst_&GetADODBConnection();
 	              //$filename = $pathtoroot.$admin."/install/inportal_remove.sql";              
 	              //RunSchemaFile($ado,$filename);
 	              /* run install again */
@@ -426,7 +426,7 @@
 }
 
 if ($state == "upgrade") {
-    $ado =& inst_GetADODBConnection();
+    $ado =& inst_&GetADODBConnection();
     
     $Modules = array();
     $Texts = array();    
@@ -486,7 +486,7 @@
 }
 
 if ($state == "upgrade_process") {
-    $ado =& inst_GetADODBConnection();	
+    $ado =& inst_&GetADODBConnection();	
 	$mod_arr = $_POST['modules'];
 	
     foreach($mod_arr as $p)
@@ -584,7 +584,7 @@
 		
 		if(file_exists($backupfile) && is_readable($backupfile))
 		{
-           $ado =& inst_GetADODBConnection();
+           $ado =& inst_&GetADODBConnection();
 
 	       $show_warning = false;              
 	       
@@ -642,7 +642,7 @@
 
 if($state=="restore_run")
 {
-  $ado =& inst_GetADODBConnection();
+  $ado =& inst_&GetADODBConnection();
   $FileOffset = (int)$_GET["Offset"];
   if(!strlen($backupfile))
     $backupfile = SuperStrip($_GET['File'], true);
@@ -888,7 +888,7 @@
 
 if($state=="reinstall")
 {
-    $ado =& inst_GetADODBConnection();
+    $ado =& inst_&GetADODBConnection();
     
     $show_upgrade = false;
 
@@ -1039,7 +1039,7 @@
 
 if($state=="runsql")
 {    
-  $ado =& inst_GetADODBConnection();
+  $ado =& inst_&GetADODBConnection();
   $installed = TableExists($ado,"ConfigurationAdmin,Category,Permissions");
   if(!$installed)
   {  
@@ -1113,7 +1113,7 @@
 }
 
 if ($state == "finish") {
-    $ado =& inst_GetADODBConnection();
+    $ado =& inst_&GetADODBConnection();
   	$PhraseTable = GetTablePrefix()."ImportPhrases";
   	$EventTable = GetTablePrefix()."ImportEvents";    
 	$ado->Execute("DROP TABLE IF EXISTS $PhraseTable");
@@ -1139,7 +1139,7 @@
   {
   	  $pass = md5($pass);
       $sql = "UPDATE ".$g_TablePrefix."ConfigurationValues SET VariableValue = '$pass' WHERE VariableName='RootPass' OR VariableName='RootPassVerify'";
-      $ado =& inst_GetADODBConnection();
+      $ado =& inst_&GetADODBConnection();
       $ado->Execute($sql);
       $state="modselect";
   }
@@ -1154,7 +1154,7 @@
 {
   include_once($pathtoroot."kernel/include/xml.php");
 
-  $ado =& inst_GetADODBConnection();
+  $ado =& inst_&GetADODBConnection();
   
   if (TableExists($ado, "Language,Phrase")) {
 	  $MaxInserts = 200;
@@ -1333,7 +1333,7 @@
   	  }
   	  else
   	  {
-  	    $db =& GetADODBConnection();
+  	    $db =&GetADODBConnection();
     	$prefix = GetTablePrefix();
     	$db->Execute('DROP TABLE IF EXISTS '.$prefix.'ImportPhrases');
     	$db->Execute('DROP TABLE IF EXISTS '.$prefix.'ImportEvents');
@@ -1354,7 +1354,7 @@
 if($state=="lang_default_set")
 {
 //	phpinfo(INFO_VARIABLES);
-    /*$ado =& inst_GetADODBConnection();
+    /*$ado =& inst_&GetADODBConnection();
   	$PhraseTable = GetTablePrefix()."ImportPhrases";
   	$EventTable = GetTablePrefix()."ImportEvents";    
 	$ado->Execute("DROP TABLE IF EXISTS $PhraseTable");
@@ -1386,7 +1386,7 @@
     $doms = $_POST["domain"];
     if(is_array($doms))
     {
-        $ado =& inst_GetADODBConnection();
+        $ado =& inst_&GetADODBConnection();
         require_once $pathtoroot.'kernel/include/tag-class.php';
         if( !isset($objTagList) || !is_object($objTagList) ) $objTagList = new clsTagList();
         foreach($doms as $p)
@@ -1478,7 +1478,7 @@
     //$g_DomainName= $_SERVER["HTTP_HOST"];
     save_values();
 
-    $ado =& inst_GetADODBConnection();
+    $ado =& inst_&GetADODBConnection();
     if(substr($sitepath,0,1)!="/")
         $sitepath="/".$sitepath;
     if(substr($sitepath,-1)!="/")
@@ -1565,7 +1565,7 @@
     ## get & define Non-Blocking & Blocking versions ## 
 	$blocking_sockets = minimum_php_version("4.3.0")? 0 : 1;
 	
-	$ado =& inst_GetADODBConnection();
+	$ado =& inst_&GetADODBConnection();
     $sql = "UPDATE ".$g_TablePrefix."ConfigurationValues SET VariableValue = '$blocking_sockets' WHERE VariableName='SocketBlockingMode'";
     $ado->Execute($sql);
     ## get & define Non-Blocking & Blocking versions ## 
Index: trunk/kernel/include/usersession.php
===================================================================
diff -u -N -r510 -r534
--- trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 510)
+++ trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 534)
@@ -28,7 +28,7 @@
         global $objConfig, $objLanguages, $objThemes, $m_var_list;
 
         $this->m_Errors = new clsErrorManager();
-        $this->adodbConnection = GetADODBConnection();
+        $this->adodbConnection = &GetADODBConnection();
         
         $this->PermCache = array();        
         $this->PermCacheGroups ="";
Index: trunk/admin/config/config_lang.php
===================================================================
diff -u -N -r374 -r534
--- trunk/admin/config/config_lang.php	(.../config_lang.php)	(revision 374)
+++ trunk/admin/config/config_lang.php	(.../config_lang.php)	(revision 534)
@@ -197,7 +197,7 @@
 
 
 if ($_GET['action'] == "cancel") {
-  	$ado = GetADODBConnection();
+  	$ado = &GetADODBConnection();
   	
 	$PhraseTable = "ses_".$objSession->GetSessionKey()."_".GetTablePrefix()."ImportPhrases";
 	$EventTable = "ses_".$objSession->GetSessionKey()."_".GetTablePrefix()."ImportEvents";  	
Index: trunk/admin/users/group_addpermission.php
===================================================================
diff -u -N -r374 -r534
--- trunk/admin/users/group_addpermission.php	(.../group_addpermission.php)	(revision 374)
+++ trunk/admin/users/group_addpermission.php	(.../group_addpermission.php)	(revision 534)
@@ -155,7 +155,7 @@
 </TR>
 <?php
   $GroupId= $c->Get("GroupId");
-  $ado = GetADODBConnection();
+  $ado = &GetADODBConnection();
   $sql = "SELECT * FROM ".GetTablePrefix()."PermissionConfig WHERE ModuleId='$PermModule'";
   if($objSession->HasSystemPermission("DEBUG.LIST"))
    echo htmlentities($sql,ENT_NOQUOTES)."<br>\n";
Index: trunk/admin/users/user_select.php
===================================================================
diff -u -N -r374 -r534
--- trunk/admin/users/user_select.php	(.../user_select.php)	(revision 374)
+++ trunk/admin/users/user_select.php	(.../user_select.php)	(revision 534)
@@ -159,7 +159,7 @@
   {    
     case "addgroup_users":
       $SelectorType = "radio"; 
-      $ado = GetADODBConnection();  
+      $ado = &GetADODBConnection();  
       $sql = "SELECT Distinct(PortalUserId) FROM ".GetTablePrefix()."UserGroup WHERE GroupId=".$_GET["GroupId"];    
       $rs = $ado->Execute($sql);
       $inlist = array();
Index: trunk/kernel/include/itemdb.php
===================================================================
diff -u -N -r470 -r534
--- trunk/kernel/include/itemdb.php	(.../itemdb.php)	(revision 470)
+++ trunk/kernel/include/itemdb.php	(.../itemdb.php)	(revision 534)
@@ -16,7 +16,7 @@
 
   function clsItemDB()
   {
-      $this->adodbConnection = GetADODBConnection();
+      $this->adodbConnection = &GetADODBConnection();
       $this->tablename="";
       $this->NoResourceId=0;  
       $this->debuglevel=0;
Index: trunk/admin/install/restore_select.php
===================================================================
diff -u -N -r383 -r534
--- trunk/admin/install/restore_select.php	(.../restore_select.php)	(revision 383)
+++ trunk/admin/install/restore_select.php	(.../restore_select.php)	(revision 534)
@@ -1,7 +1,7 @@
 <?php
 
 if(!strlen($filepath)) {
-	$ado =& inst_GetADODBConnection();
+	$ado =& inst_&GetADODBConnection();
 	$sql = "SELECT VariableValue FROM ".$g_TablePrefix."ConfigurationValues WHERE VariableName = 'Backup_Path'";
 	$rs = $ado->Execute($sql);
 	
Index: trunk/admin/config/edit_label.php
===================================================================
diff -u -N -r517 -r534
--- trunk/admin/config/edit_label.php	(.../edit_label.php)	(revision 517)
+++ trunk/admin/config/edit_label.php	(.../edit_label.php)	(revision 534)
@@ -136,7 +136,7 @@
 	$print_list = true;
 }
 else {
-	$ado = GetADODBConnection();
+	$ado = &GetADODBConnection();
 	$sql = "SELECT PhraseId FROM ".$objSession->GetEditTable("Phrase");
 
 	if ($LangId) {
Index: trunk/kernel/include/item.php
===================================================================
diff -u -N -r470 -r534
--- trunk/kernel/include/item.php	(.../item.php)	(revision 470)
+++ trunk/kernel/include/item.php	(.../item.php)	(revision 534)
@@ -457,7 +457,7 @@
 		$count = 0;
 		$id = $this->Get("ResourceId");
 		$sql = "SELECT count(*) as DupCount FROM ItemRating WHERE IPAddress='$ip' and ItemId=$id";
-		$adodbConnection = GetADODBConnection();
+		$adodbConnection = &GetADODBConnection();
 		$rs = $adodbConnection->Execute($sql);
 		if($rs)
 		{
Index: trunk/admin/config/addlang.php
===================================================================
diff -u -N -r374 -r534
--- trunk/admin/config/addlang.php	(.../addlang.php)	(revision 374)
+++ trunk/admin/config/addlang.php	(.../addlang.php)	(revision 534)
@@ -290,7 +290,7 @@
     <SELECT NAME="srcpack">    
     <OPTION VALUE="0">--<?php echo prompt_language("la_prompt_Select_Source"); ?>
     <?php
-      $ado = GetADODBConnection();
+      $ado = &GetADODBConnection();
       $sql = "SELECT * FROM ".GetTablePrefix()."Language";
       $rs = $ado->Execute($sql);
       while($rs && !$rs->EOF)
Index: trunk/admin/install/install_lib.php
===================================================================
diff -u -N -r478 -r534
--- trunk/admin/install/install_lib.php	(.../install_lib.php)	(revision 478)
+++ trunk/admin/install/install_lib.php	(.../install_lib.php)	(revision 534)
@@ -639,7 +639,7 @@
 	$GLOBALS['g_DBUserPassword'] = $_POST["ServerPass"];
     
     // connect to database
-    $ado =& inst_GetADODBConnection();
+    $ado =& inst_&GetADODBConnection();
     if($ado->ErrorNo() != 0)
     {
         // was error while connecting
Index: trunk/kernel/admin/include/toolbar/template_editor.php
===================================================================
diff -u -N -r386 -r534
--- trunk/kernel/admin/include/toolbar/template_editor.php	(.../template_editor.php)	(revision 386)
+++ trunk/kernel/admin/include/toolbar/template_editor.php	(.../template_editor.php)	(revision 534)
@@ -17,7 +17,7 @@
 
 // get taglist + tags attributes using 2 queries
 $TablePrefix = GetTablePrefix();
-$db =& GetADODBConnection();
+$db =&GetADODBConnection();
 
 // get all tag attributes
 $TagAttribs = array();
Index: trunk/globals.php
===================================================================
diff -u -N -r529 -r534
--- trunk/globals.php	(.../globals.php)	(revision 529)
+++ trunk/globals.php	(.../globals.php)	(revision 534)
@@ -125,7 +125,7 @@
 function GetNextResourceId($Increment=1)
 {
 	$sql = "UPDATE ".GetTablePrefix()."IdGenerator SET lastid=lastid+".$Increment;
-    $adodbConnection = GetADODBConnection();
+    $adodbConnection = &GetADODBConnection();
     $adodbConnection->Execute($sql);    
     $rs = $adodbConnection->Execute("SELECT lastid FROM ".GetTablePrefix()."IdGenerator");
     $val = $rs->fields["lastid"];
@@ -181,7 +181,7 @@
 
 function TableCount($TableName, $where="",$JoinCats=1)
 {
-    $db = GetADODBConnection();
+    $db = &GetADODBConnection();
     if(!$JoinCats)
     {    
       $sql = "SELECT count(*) as TableCount FROM $TableName";
@@ -207,7 +207,7 @@
   if(strpos($countsql,"ORDER BY"))
     $countsql = substr($countsql,0,strpos($countsql,"ORDER BY"));
     
-  $db = GetADODBConnection();
+  $db = &GetADODBConnection();
   $rs = $db->Execute($countsql);
   //echo $countsql."<br>\n";
   $res = $rs->fields["TableCount"];
@@ -646,7 +646,7 @@
     $sql = "SELECT min($Field) as val FROM $Table ";
     if(strlen($where))
         $sql .= "WHERE $Where";
-    $ado = GetADODBConnection();
+    $ado = &GetADODBConnection();
     $rs = $ado->execute($sql);
     if($rs)
         $ret = (int)$rs->fields["val"];
@@ -856,7 +856,7 @@
 	$sql = "SELECT Name from $cat_table WHERE ParentId=$ParentId AND ";
 	$sql .="(Name LIKE '".addslashes($Name)."' OR Name LIKE 'Copy of ".addslashes($Name)."' OR Name LIKE 'Copy % of ".addslashes($Name)."')";
 
-	$ado = GetADODBConnection();
+	$ado = &GetADODBConnection();
 	$rs = $ado->Execute($sql);
 	$ret = array();
 	while($rs && !$rs->EOF)
@@ -873,7 +873,7 @@
 	$sql = "SELECT $Field FROM $Table INNER JOIN $cat_table ON ($Table.ResourceId=$cat_table.ItemResourceId) ";
 	$sql .=" WHERE ($Field LIKE 'Copy % of $Name' OR $Field LIKE '$Name' OR $Field LIKE 'Copy of $Name') AND CategoryId=$CategoryId";
 	//echo $sql."<br>\n ";
-	$ado = GetADODBConnection();
+	$ado = &GetADODBConnection();
 	$rs = $ado->Execute($sql);
 	$ret = array();
 	while($rs && !$rs->EOF)
@@ -1380,7 +1380,7 @@
 	if( count($import_scripts) == 0 )
 	{
 		$sql = 'SELECT * FROM '.GetTablePrefix().'ImportScripts ORDER BY is_id';
-		$db =& GetADODBConnection();
+		$db =&GetADODBConnection();
 		$rs = $db->Execute($sql);
 		if( $rs && $rs->RecordCount() > 0 )
 		{
Index: trunk/kernel/parser.php
===================================================================
diff -u -N -r526 -r534
--- trunk/kernel/parser.php	(.../parser.php)	(revision 526)
+++ trunk/kernel/parser.php	(.../parser.php)	(revision 534)
@@ -2436,7 +2436,7 @@
     $perm = strtoupper($_GET["error"]);
     if(strlen($perm))
     {
-        $ado = GetADODBConnection();    
+        $ado = &GetADODBConnection();    
         $sql = "SELECT * FROM ".GetTablePrefix()."PermissionConfig WHERE PermissionName ='$perm'";
         $rs = $ado->Execute($sql);
         if($rs && !$rs->EOF)
@@ -2562,7 +2562,7 @@
 {
     global $objConfig, $objCatList;
    
-    $ado = GetADODBConnection();
+    $ado = &GetADODBConnection();
 
     if($attribs["_local"] && $objCatList->CurrentCategoryID() != 0)
     {
@@ -3047,7 +3047,7 @@
 
     global $online_friends;
 
-    $ado = GetADODBConnection();
+    $ado = &GetADODBConnection();
 
     $status = strtolower($attribs["_status"]);
     
@@ -3140,7 +3140,7 @@
 
     global $online_friends;
 
-    $ado = GetADODBConnection();
+    $ado = &GetADODBConnection();
     
     $logedin_user = $objSession->Get("PortalUserId");
     $u =& $objUsers->GetUser($logedin_user);    
@@ -3212,7 +3212,7 @@
     $logedin_user = $objSession->Get("PortalUserId");
 
     $ret =0;
-    $ado = GetADODBConnection();
+    $ado = &GetADODBConnection();
     $today = mktime(0,0,0,date("m"),date("d"),date("Y")); 
     $sql = "SELECT count(*) as c FROM ".GetTablePrefix()."Favorites WHERE ItemTypeId=6 and PortalUserId=".$objSession->Get("PortalUserId")." AND Modified>$today";
     $rs = $ado->Execute($sql);
@@ -3360,7 +3360,7 @@
 	if (!$OwnCount || is_null($OwnCount))
 		$sql_add.= " AND SessionKey!='".$objSession->GetSessionKey()."'";	
 	
-	$ado = GetADODBConnection();
+	$ado = &GetADODBConnection();
 	$sql = "SELECT COUNT(*) AS Counter FROM ".GetTablePrefix()."UserSession WHERE Status=1".$sql_add;
 	$rs = $ado->Execute($sql);		    
     $ret = ($rs && !$rs->EOF)? $rs->fields["Counter"] : 0;  
Index: trunk/kernel/include/language.php
===================================================================
diff -u -N -r313 -r534
--- trunk/kernel/include/language.php	(.../language.php)	(revision 313)
+++ trunk/kernel/include/language.php	(.../language.php)	(revision 534)
@@ -552,7 +552,7 @@
         global $objConfig;
 
         $this->m_CachedLanguage = $LangId;
-        $this->adodbConnection =& GetADODBConnection();
+        $this->adodbConnection =&GetADODBConnection();
         $this->Clear();
     }
 
Index: trunk/admin/help/credits.php
===================================================================
diff -u -N -r374 -r534
--- trunk/admin/help/credits.php	(.../credits.php)	(revision 374)
+++ trunk/admin/help/credits.php	(.../credits.php)	(revision 534)
@@ -94,7 +94,7 @@
 require_once($pathtoroot.$admin."/browse/toolbar.php");
 require_once($pathtoroot.$admin."/listview/listview.php");
 
-$ado = GetADODBConnection(); 
+$ado = &GetADODBConnection(); 
 $title = "In-Portal ".language("la_Credits_Title");
 /* page header */
 print <<<END
Index: trunk/admin/category/addrelation.php
===================================================================
diff -u -N -r374 -r534
--- trunk/admin/category/addrelation.php	(.../addrelation.php)	(revision 374)
+++ trunk/admin/category/addrelation.php	(.../addrelation.php)	(revision 534)
@@ -151,7 +151,7 @@
 
 $section = 'in-portal:editcategory_relation';
 
-$ado = GetADODBConnection();
+$ado = &GetADODBConnection();
  
 /* page header */
 print <<<END
Index: trunk/admin/config/importlang_progress.php
===================================================================
diff -u -N -r374 -r534
--- trunk/admin/config/importlang_progress.php	(.../importlang_progress.php)	(revision 374)
+++ trunk/admin/config/importlang_progress.php	(.../importlang_progress.php)	(revision 534)
@@ -91,7 +91,7 @@
 include_once($pathtoroot."kernel/include/xml.php");
 	
 $section = "in-portal:lang_import";
-$ado = GetADODBConnection();
+$ado = &GetADODBConnection();
 $MaxInserts = 200;
 $PhraseTable = "ses_".$objSession->GetSessionKey()."_".GetTablePrefix()."ImportPhrases";
 $EventTable = "ses_".$objSession->GetSessionKey()."_".GetTablePrefix()."ImportEvents";
Index: trunk/kernel/frontaction.php
===================================================================
diff -u -N -r510 -r534
--- trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 510)
+++ trunk/kernel/frontaction.php	(.../frontaction.php)	(revision 534)
@@ -691,7 +691,7 @@
         	if(ValidEmail($email))
         	{
               $sql = "SELECT * FROM ".GetTablePrefix()."SuggestMail WHERE email='".inp_escape($email,0)."' and sent<".$cutoff;
-              $adodbConnection = GetADODBConnection();
+              $adodbConnection = &GetADODBConnection();
               $rs = $adodbConnection->Execute($sql);
               
               $rs = false;
Index: trunk/kernel/include/modules.php
===================================================================
diff -u -N -r415 -r534
--- trunk/kernel/include/modules.php	(.../modules.php)	(revision 415)
+++ trunk/kernel/include/modules.php	(.../modules.php)	(revision 534)
@@ -699,7 +699,7 @@
 //echo "Before Stuff<br>";
 LogEntry("Loading Modules\n");
 /* get the module list from the database */
-$adodbConnection = GetADODBConnection();	
+$adodbConnection = &GetADODBConnection();	
 $sql = "SELECT Name, Path, Var,TemplatePath, RootCat from ".GetTablePrefix()."Modules where Loaded=1 ORDER BY LoadOrder";
 $rs = $adodbConnection->Execute($sql);
 
Index: trunk/admin/config/missing_label_search.php
===================================================================
diff -u -N -r374 -r534
--- trunk/admin/config/missing_label_search.php	(.../missing_label_search.php)	(revision 374)
+++ trunk/admin/config/missing_label_search.php	(.../missing_label_search.php)	(revision 534)
@@ -128,7 +128,7 @@
 $section = "in-portal:missing_label_search";
 
 $FilesPerLoad = 20;
-$ado = GetADODBConnection();
+$ado = &GetADODBConnection();
 
 if($_GET["LangId"])
 {
Index: trunk/admin/config/email_edit.php
===================================================================
diff -u -N -r374 -r534
--- trunk/admin/config/email_edit.php	(.../email_edit.php)	(revision 374)
+++ trunk/admin/config/email_edit.php	(.../email_edit.php)	(revision 534)
@@ -162,7 +162,7 @@
 
 $envar = "env=" . BuildEnv() . "&en=$en";
 $section = 'in-portal:lang_email';
-$ado = GetADODBConnection();
+$ado = &GetADODBConnection();
 
 /* page header */
 print <<<END
Index: trunk/kernel/include/parseditem.php
===================================================================
diff -u -N -r525 -r534
--- trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 525)
+++ trunk/kernel/include/parseditem.php	(.../parseditem.php)	(revision 534)
@@ -673,7 +673,7 @@
     function clsItemCollection()
     {
 
-      $this->adodbConnection = GetADODBConnection();
+      $this->adodbConnection = &GetADODBConnection();
 
       $this->Clear();
       $this->BasePermission="";
@@ -2863,7 +2863,7 @@
 	{
 		// use $this->SetTable('live', 'table name');
 		// in inherited constructors to set table for list
-		$this->db =& GetADODBConnection();	
+		$this->db =&GetADODBConnection();	
 	}
 	
 	function SetTable($action, $table_name = null)
Index: trunk/kernel/include/searchconfig.php
===================================================================
diff -u -N -r91 -r534
--- trunk/kernel/include/searchconfig.php	(.../searchconfig.php)	(revision 91)
+++ trunk/kernel/include/searchconfig.php	(.../searchconfig.php)	(revision 534)
@@ -230,7 +230,7 @@
     {        
         $this->SourceTable = GetTablePrefix()."SearchConfig";
         $this->classname = "clsSearchConfig";
-        $this->adodbConnection = GetADODBConnection();
+        $this->adodbConnection = &GetADODBConnection();
         $this->Items = array();
         if($module)
             $this->LoadModule($module);
Index: trunk/kernel/include/itemreview.php
===================================================================
diff -u -N -r366 -r534
--- trunk/kernel/include/itemreview.php	(.../itemreview.php)	(revision 366)
+++ trunk/kernel/include/itemreview.php	(.../itemreview.php)	(revision 534)
@@ -4,7 +4,7 @@
 {
         $count = 0;
         $sql = "SELECT count(*) as DupCount FROM $SourceTable WHERE IPAddress='$ip' and ItemId=$id";
-        $adodbConnection = GetADODBConnection(); 
+        $adodbConnection = &GetADODBConnection(); 
         $rs = $adodbConnection->Execute($sql);
         if($rs)
         {
Index: trunk/kernel/include/emailmessage.php
===================================================================
diff -u -N -r448 -r534
--- trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 448)
+++ trunk/kernel/include/emailmessage.php	(.../emailmessage.php)	(revision 534)
@@ -157,7 +157,7 @@
     {
         global $objUsers, $objEmailQueue,$objConfig;
 
-        $conn = GetADODBConnection();
+        $conn = &GetADODBConnection();
         //$this->recipient = $objUsers->GetUser($UserId);
         //$this->recipient->TagPrefix="touser";
         if(strlen($EmailAddress))
@@ -206,7 +206,7 @@
     {
         global $objUsers, $objEmailQueue, $objConfig;
 
-        $conn = GetADODBConnection();
+        $conn = &GetADODBConnection();
         //echo "Handling Event ".$this->Get("Event")." for user $UserId <br>\n";
         $this->recipient = new clsPortalUser($UserId); // $objUsers->GetItem($UserId);
         //echo "<PRE>";print_r($this->recipient); echo "</PRE>";
@@ -265,7 +265,7 @@
     {
         global $objUsers, $objConfig, $objEmailQueue;
 
-        $conn = GetADODBConnection();
+        $conn = &GetADODBConnection();
         
         $this->recipient = $objUsers->GetUser($this->Get("FromUserId"));
         $this->recipient->TagPrefix="touser";
@@ -691,7 +691,7 @@
             $this->MessagesSent++;
             
             $time = time();
-            $conn = GetADODBConnection();
+            $conn = &GetADODBConnection();
             
 /*            $sql = "INSERT INTO ".GetTablePrefix()."EmailLog VALUES ('', '".htmlspecialchars($From)."', '".htmlspecialchars($To)."', '$Subject', $time, '')";
             $conn->Execute($sql);*/
@@ -789,7 +789,7 @@
     {
         global $objSession;
 
-        $ado = GetADODBConnection();
+        $ado = &GetADODBConnection();
         $To = mysql_escape_string($To);
         $From = mysql_escape_string($From);
         $Msg = mysql_escape_string($Msg);        
@@ -803,7 +803,7 @@
     {
         global $objConfig, $objSession, $TotalMessagesSent;
 
-        $ado = GetADODBConnection();
+        $ado = &GetADODBConnection();
         $MaxAllowed = $this->MessagesAtOnce;
         
         $del_sql = array();
@@ -843,7 +843,7 @@
 		$headers = "From: $f\n";
 		$headers .= "MIME-Version: 1.0\n";
 		
-        $conn = GetADODBConnection();
+        $conn = &GetADODBConnection();
 		$time = time();
 		
 		$sendTo  = $ToName;
Index: trunk/admin/users/user_addimage.php
===================================================================
diff -u -N -r374 -r534
--- trunk/admin/users/user_addimage.php	(.../user_addimage.php)	(revision 374)
+++ trunk/admin/users/user_addimage.php	(.../user_addimage.php)	(revision 534)
@@ -147,7 +147,7 @@
 
 $envar = "env=" . BuildEnv() . "&en=$en";
 $section = 'in-portal:edituser_image';
-$ado = GetADODBConnection();
+$ado = &GetADODBConnection();
 
 /* page header */
 print <<<END
Index: trunk/kernel/action.php
===================================================================
diff -u -N -r521 -r534
--- trunk/kernel/action.php	(.../action.php)	(revision 521)
+++ trunk/kernel/action.php	(.../action.php)	(revision 534)
@@ -345,7 +345,7 @@
 			
 		case "m_remove_group":
 			if($ro_perm) break;
-			$adodbConnection = GetAdodbConnection();
+			$adodbConnection = &GetADODBConnection();
 			$adodbConnection->Execute("DELETE FROM UserGroup where UserId='$UserId' AND GroupId='$GroupId'");
 			break;
 
@@ -369,7 +369,7 @@
             $GroupId = $_POST["GroupId"];
             $CatId = $_POST["CategoryId"];
             $Module = $_POST["Module"];
-            $ado = GetADODBConnection();
+            $ado = &GetADODBConnection();
             $sql = "SELECT * FROM ".GetTablePrefix()."PermissionConfig WHERE ModuleId='$Module'";
             $rs = $ado->Execute($sql);
             $PermNames = array();
@@ -437,7 +437,7 @@
         break; 
      	case "m_perm_delete_group":
 			if($ro_perm) break;
-			$ado = GetADODBConnection();
+			$ado = &GetADODBConnection();
 			$CatId = $_POST["CategoryId"];
 			foreach($_POST["itemlist"] as $groupid)
 			{
@@ -656,7 +656,7 @@
      break;     
 
      case "m_rel_delete":
-         $adodbConnection= GetADODBConnection();
+         $adodbConnection= &GetADODBConnection();
          $table = $objSession->GetEditTable("Relationship");
          if(isset($_POST["itemlist"]))
          {
@@ -685,7 +685,7 @@
 
          //$r = $RelList->Add($_POST["SourceId"],$_POST["SourceType"],$_POST["TargetId"],$_POST["TargetType"],
            //               0,(int)$_POST["Enabled"],$_POST["RelType"], $Rel);
-         $ado = GetADODBConnection();
+         $ado = &GetADODBConnection();
          $NewId = $ado->GetOne('SELECT MIN(RelationshipId) as MinValue FROM '.$RelList->SourceTable);
          if($NewId > 0) $NewId = 0;
          $NewId--;
@@ -841,7 +841,7 @@
      	$id = $_POST["ItemId"];                   
         $objEditData = new clsCustomDataList(); //$objSession->GetEditTable("CustomMetaData"));		
         $objEditData->SetTable('edit');
-        $ado = GetADODBConnection();
+        $ado = &GetADODBConnection();
 
         if($id && is_array($_POST["CustomData"]))
         {
@@ -999,7 +999,7 @@
          $r = $objReviews->AddReview($CreatedOn,$ReviewText,$Status, $IPAddress, 
                                      (int)$_POST["review_priority"], $_POST["ItemId"],$_POST["ItemType"],
                                      $CreatedById,$html, $post_info['Module']);                                    
-         $ado = GetADODBConnection();
+         $ado = &GetADODBConnection();
          $rs = $ado->Execute("SELECT MIN(ReviewId) as MinValue FROM ".$objReviews->SourceTable);
          $NewId = $rs->fields["MinValue"]-1;
          $sql = "UPDATE ".$objReviews->SourceTable." SET ReviewId=".$NewId." WHERE ReviewId=".$r->Get("ReviewId");
@@ -1115,7 +1115,7 @@
          $t = $objEditItems->AddTheme($_POST["name"],$_POST["description"],(int)$_POST["enabled"],
                                       (int)$_POST["CacheTimeout"],$Primary);
 
-         $ado = GetADODBConnection();
+         $ado = &GetADODBConnection();
          $rs = $ado->Execute("SELECT MIN(ThemeId) as MinValue FROM ".$objEditItems->SourceTable);
          $NewId = $rs->fields["MinValue"]-1;
          $sql = "UPDATE ".$objEditItems->SourceTable." SET ThemeId=".$NewId." WHERE ThemeId=".$t->Get("ThemeId");
@@ -1231,7 +1231,7 @@
                                          $_POST["icon"],$_POST["date_format"],$_POST["time_format"],
                                          $_POST["decimal"],$_POST["thousand"]);
 
-         $ado = GetADODBConnection();
+         $ado = &GetADODBConnection();
          $rs = $ado->Execute("SELECT MIN(LanguageId) as MinValue FROM ".$objEditItems->SourceTable);
          $NewId = $rs->fields["MinValue"]-1;
          $sql = "UPDATE ".$objEditItems->SourceTable." SET LanguageId=".$NewId." WHERE LanguageId=".$l->Get("LanguageId");
@@ -1293,7 +1293,7 @@
                                      
          if($_POST["importlabels"]==1 && $_POST["srcpack"]>0)
          {
-            $ado = GetADODBConnection();
+            $ado = &GetADODBConnection();
             $rs = $ado->Execute("SELECT * FROM ".GetTablePrefix()."Phrase WHERE LanguageId=".$_POST["srcpack"]);
             $plist = new clsPhraseList();
             $plist->SourceTable = $objSession->GetEditTable("Phrase");
@@ -1367,7 +1367,7 @@
          {
            		$r = $objPhraseList->AddPhrase($_POST["name"][0],$_POST["LanguageId"],$_POST["translation"][0],$_POST["phrasetype"][0]);           
            		if ($r != "Error") {
-	           		$ado = GetADODBConnection();
+	           		$ado = &GetADODBConnection();
 	           		$rs = $ado->Execute("SELECT MIN(PhraseId) as MinValue FROM ".$objPhraseList->SourceTable);
 	           		$NewId = $rs->fields["MinValue"]-1;
 	           		$sql = "UPDATE ".$objPhraseList->SourceTable." SET PhraseId=".$NewId." WHERE PhraseId=$PhraseId";
@@ -1420,7 +1420,7 @@
            foreach($_POST["itemlist"] as $id)
            {
            	 $sql = "UPDATE ".$objSession->GetEditTable("Phrase")." SET LanguageId = 0 WHERE PhraseId = ".$id;
-           	 $ado = GetADODBConnection();
+           	 $ado = &GetADODBConnection();
            	 $ado->Execute($sql);
            }
         }
@@ -1610,7 +1610,7 @@
          break;
        }
        
-       $ado = GetADODBConnection();
+       $ado = &GetADODBConnection();
        $NewId = $ado->GetOne('SELECT MIN(ImageId) as MinValue FROM '.$objImageList->SourceTable);
        if($NewId > 0) $NewId = 0;
        $NewId--;
@@ -1995,7 +1995,7 @@
     case "m_sql_query":
 		if($ro_perm) break;
     	$SqlQuery = $_POST["sql"];
-		$ado = GetADODBConnection();
+		$ado = &GetADODBConnection();
 		if(strlen($sql))
 		{
 		  $SqlResult = $ado->Execute(stripslashes($SqlQuery));
@@ -2005,14 +2005,14 @@
     break;
     case "m_purge_email_log":
 	 	 if($ro_perm) break;
-	 	 $ado = GetADODBConnection();       	
+	 	 $ado = &GetADODBConnection();       	
 
 		$sql = "DELETE FROM ".GetTablePrefix()."EmailLog";
 		$ado->Execute($sql);
     break;    
     case "m_session_delete":
 	 	 if($ro_perm) break;
-	 	 $ado = GetADODBConnection();       	
+	 	 $ado = &GetADODBConnection();       	
          if (count($_POST['itemlist']) > 0) {
 	 	 	foreach($_POST["itemlist"] as $id)
          	{
@@ -2169,7 +2169,7 @@
 	/* category Edit */
 	if( GetVar('CatEditStatus') == 1 )
 	{ 
-	    $adodbConnection = GetADODBConnection();
+	    $adodbConnection = &GetADODBConnection();
 	//    $sql = "SELECT * FROM ".$objSession->GetEditTable("Category")." WHERE CategoryId=0";    
 	    $sql = "SELECT ParentId FROM ".$objSession->GetEditTable("Category")." WHERE CategoryId=-1";
 	    
@@ -2279,7 +2279,7 @@
 	   $objEditList = new clsPhraseList();
 	   $objEditList->SourceTable = $objSession->GetEditTable("Phrase");
 	
-	   $ado = GetADODBConnection();
+	   $ado = &GetADODBConnection();
 	   $rs = $ado->Execute("SELECT MIN(PhraseId) as MinValue FROM ".$objEditList->SourceTable);
 	   $NewId = $rs->fields["MinValue"]-1;
 	   
@@ -2302,7 +2302,7 @@
 	if( GetVar('MissingLangEditStatus') == 2 )
 	{
 	  $table = $objSession->GetSessionKey()."_".$ThemeId."_labels";
-	  $ado = GetADODBConnection();
+	  $ado = &GetADODBConnection();
 	  $ado->Execute("DROP TABLE IF EXISTS ".$table);
 	}
 	
Index: trunk/kernel/include/searchitems.php
===================================================================
diff -u -N -r402 -r534
--- trunk/kernel/include/searchitems.php	(.../searchitems.php)	(revision 402)
+++ trunk/kernel/include/searchitems.php	(.../searchitems.php)	(revision 534)
@@ -723,7 +723,7 @@
 {
     global $KeywordIgnore;
 
-    $adodbConnection = GetADODBConnection();
+    $adodbConnection = &GetADODBConnection();
 
     $rs = $adodbConnection->Execute("SELECT * FROM IgnoreKeywords");
     while($rs && !$rs->EOF)
Index: trunk/admin/category/addpermission.php
===================================================================
diff -u -N -r374 -r534
--- trunk/admin/category/addpermission.php	(.../addpermission.php)	(revision 374)
+++ trunk/admin/category/addpermission.php	(.../addpermission.php)	(revision 534)
@@ -149,7 +149,7 @@
 $p = $objCatList->GetCategory($c->Get("ParentId"));
 $objParentPerms->LoadPermTree($p);
 
-$ado = GetADODBConnection();  
+$ado = &GetADODBConnection();  
 
 /* page header */
 print <<<END
Index: trunk/admin/email/do_send.php
===================================================================
diff -u -N -r437 -r534
--- trunk/admin/email/do_send.php	(.../do_send.php)	(revision 437)
+++ trunk/admin/email/do_send.php	(.../do_send.php)	(revision 534)
@@ -105,7 +105,7 @@
     $State = $_GET["EmailState"];
 }
 
-$ado = GetADODBConnection();
+$ado = &GetADODBConnection();
 $table = "ses_".$objSession->GetSessionKey()."_sendmail";
 $MessagesPerPage =2;
 
Index: trunk/admin/category/addimage.php
===================================================================
diff -u -N -r374 -r534
--- trunk/admin/category/addimage.php	(.../addimage.php)	(revision 374)
+++ trunk/admin/category/addimage.php	(.../addimage.php)	(revision 534)
@@ -151,7 +151,7 @@
 
 $envar = "env=" . BuildEnv() . "&en=$en";
 $section = 'in-portal:cat_imageedit';
-$ado = GetADODBConnection();
+$ado = &GetADODBConnection();
 
 /* page header */
 print <<<END
Index: trunk/admin/category/category_maint.php
===================================================================
diff -u -N -r378 -r534
--- trunk/admin/category/category_maint.php	(.../category_maint.php)	(revision 378)
+++ trunk/admin/category/category_maint.php	(.../category_maint.php)	(revision 534)
@@ -70,7 +70,7 @@
 $section = "in-portal:category_maint";
 
 $CatsPerLoad = 10;
-$ado = GetADODBConnection();
+$ado = &GetADODBConnection();
 
 // init vars
 if( !isset($NumCats) ) $NumCats = 0; 
Index: trunk/admin/backup/backup2.php
===================================================================
diff -u -N -r374 -r534
--- trunk/admin/backup/backup2.php	(.../backup2.php)	(revision 374)
+++ trunk/admin/backup/backup2.php	(.../backup2.php)	(revision 534)
@@ -96,7 +96,7 @@
 
 /*******************************BEGINNING*********************************/
 
-$conn = GetAdodbConnection();
+$conn = &GetADODBConnection();
 
 
 $tables = $conn->MetaTables(); //  array_keys($tables);
@@ -158,7 +158,7 @@
 $fp = fopen($filename,"a");
 
 if (filesize($filename) == 0) {
-	$ado = GetADODBConnection();
+	$ado = &GetADODBConnection();
 	$sql = "SELECT Name, Version FROM ".GetTablePrefix()."Modules";
 	$r = $ado->Execute($sql);
 	while ($r && !$r->EOF) {
@@ -206,7 +206,7 @@
 {
 	global $out;
 	
-    $conn = GetAdodbConnection();
+    $conn = &GetADODBConnection();
 
     if ($mywhere !="")
     {
Index: trunk/admin/users/group_select.php
===================================================================
diff -u -N -r374 -r534
--- trunk/admin/users/group_select.php	(.../group_select.php)	(revision 374)
+++ trunk/admin/users/group_select.php	(.../group_select.php)	(revision 534)
@@ -146,7 +146,7 @@
   {
     case "addcategory_permissions":
       $SelectorType = "radio"; 
-      $ado = GetADODBConnection();  
+      $ado = &GetADODBConnection();  
 	  $sql = "SELECT Distinct(GroupId) FROM ".GetTablePrefix()."Permissions WHERE CatId=".$_GET["CatId"];            
       //$sql = "SELECT Distinct(p.GroupId) FROM ".GetTablePrefix()."Permissions AS p LEFT JOIN ".GetTablePrefix()."PortalGroup AS pg ON p.GroupId = pg.GroupId WHERE p.CatId=".$_GET["CatId"]." AND pg.Personal=0";      
       //echo "SQL 1: $sql<br>";
@@ -174,7 +174,7 @@
     
     case "adduser_groups":
       	$SelectorType = "radio"; 
-      	$ado = GetADODBConnection();
+      	$ado = &GetADODBConnection();
       	$sql = sprintf('SELECT GroupId FROM '.GetTablePrefix().'UserGroup WHERE PortalUserId = %s', $_GET["UserId"]);
       	$inlist = $ado->GetCol($sql);
       	if($inlist !== false)
Index: trunk/admin/users/user_addpermission.php
===================================================================
diff -u -N -r402 -r534
--- trunk/admin/users/user_addpermission.php	(.../user_addpermission.php)	(revision 402)
+++ trunk/admin/users/user_addpermission.php	(.../user_addpermission.php)	(revision 534)
@@ -172,7 +172,7 @@
 	$UserGroupExists = is_object($UserGroup);
     $permlist = array();
 
-    $ado = GetADODBConnection();
+    $ado = &GetADODBConnection();
     $sql = "SELECT * FROM ".GetTablePrefix()."PermissionConfig AS pc LEFT JOIN ".GetTablePrefix()."Phrase AS p ON pc.Description = p.Phrase WHERE pc.ModuleId='$PermModule' AND p.LanguageId = ".$objSession->Get("Language")." ORDER BY p.Translation ASC";
 
     if($objSession->HasSystemPermission("DEBUG.LIST"))
Index: trunk/kernel/admin/include/summary/modules.php
===================================================================
diff -u -N -r13 -r534
--- trunk/kernel/admin/include/summary/modules.php	(.../modules.php)	(revision 13)
+++ trunk/kernel/admin/include/summary/modules.php	(.../modules.php)	(revision 534)
@@ -53,7 +53,7 @@
         <table width="100%" height="100%" border="0" cellspacing="0" cellpadding="4">
 END;
 
-          $ado=GetADODBConnection();
+          $ado=&GetADODBConnection();
           $rs = $ado->Execute("SELECT * FROM ".GetTablePrefix()."Modules");
           while($rs && !$rs->EOF)
           {
Index: trunk/admin/backup/restore2.php
===================================================================
diff -u -N -r374 -r534
--- trunk/admin/backup/restore2.php	(.../restore2.php)	(revision 374)
+++ trunk/admin/backup/restore2.php	(.../restore2.php)	(revision 534)
@@ -81,7 +81,7 @@
 $formaction = $rootURL."admin/backup/restore3.php?".$envar;
 $formaction = "restore3.php?".$envar;
 $restoreexit = $rootURL."admin/backup/restore4.php?".$envar;
-$conn = GetAdodbConnection();
+$conn = &GetADODBConnection();
 
 
 $totalfiles =   $objSession->GetVariable("restore_files_num");
Index: trunk/admin/install/inst_ado.php
===================================================================
diff -u -N -r383 -r534
--- trunk/admin/install/inst_ado.php	(.../inst_ado.php)	(revision 383)
+++ trunk/admin/install/inst_ado.php	(.../inst_ado.php)	(revision 534)
@@ -1,6 +1,6 @@
 <?php
 
-function &inst_GetADODBConnection()
+function &inst_&GetADODBConnection()
 {
 	static $DB = null;
 	global $g_DBType, $g_DBHost, $g_DBUser, $g_DBUserPassword, $g_DBName, $g_DebugMode;
Index: trunk/admin/category/addpermission_modules.php
===================================================================
diff -u -N -r374 -r534
--- trunk/admin/category/addpermission_modules.php	(.../addpermission_modules.php)	(revision 374)
+++ trunk/admin/category/addpermission_modules.php	(.../addpermission_modules.php)	(revision 534)
@@ -175,7 +175,7 @@
 
 $objPermList = new clsPermList($c->Get("CategoryId"),$GroupId);
   
-$ado = GetADODBConnection();  
+$ado = &GetADODBConnection();  
 $sql = "SELECT DISTINCT(ModuleId) FROM ".GetTablePrefix()."PermissionConfig";
 $rs = $ado->Execute($sql);
 $Modules = array();
Index: trunk/admin/backup/restore3.php
===================================================================
diff -u -N -r374 -r534
--- trunk/admin/backup/restore3.php	(.../restore3.php)	(revision 374)
+++ trunk/admin/backup/restore3.php	(.../restore3.php)	(revision 534)
@@ -76,7 +76,7 @@
 require_once($pathtoroot."admin/toolbar.php");
 require_once($pathtoroot.$admin."/install/install_lib.php");
 
-$conn = GetAdodbConnection();
+$conn = &GetADODBConnection();
 $section = "in-portal:restore";
 int_header(NULL);
 //echo "FileOffset: $FileOffset <br>\n";
Index: trunk/kernel/startup.php
===================================================================
diff -u -N -r449 -r534
--- trunk/kernel/startup.php	(.../startup.php)	(revision 449)
+++ trunk/kernel/startup.php	(.../startup.php)	(revision 534)
@@ -120,7 +120,7 @@
 /* startup is complete, so now check the mail queue to see if there's anything that needs to be sent*/
 $objEmailQueue->SendMailQeue();
 
-          $ado=GetADODBConnection();
+          $ado=&GetADODBConnection();
           $rs = $ado->Execute("SELECT * FROM ".GetTablePrefix()."Modules WHERE LoadOrder = 0");
           
           $kernel_version = $rs->fields['Version'];
Index: trunk/admin/config/addcustomfield.php
===================================================================
diff -u -N -r374 -r534
--- trunk/admin/config/addcustomfield.php	(.../addcustomfield.php)	(revision 374)
+++ trunk/admin/config/addcustomfield.php	(.../addcustomfield.php)	(revision 534)
@@ -145,7 +145,7 @@
 $section_env = "section=$section&DataType=$FieldType"; 
 $envar = "$section_env&env=".BuildEnv();
 
-$ado = GetADODBConnection();
+$ado = &GetADODBConnection();
 
 /* page header */
 print <<<END
Index: trunk/admin/users/banlist_apply.php
===================================================================
diff -u -N -r374 -r534
--- trunk/admin/users/banlist_apply.php	(.../banlist_apply.php)	(revision 374)
+++ trunk/admin/users/banlist_apply.php	(.../banlist_apply.php)	(revision 534)
@@ -93,7 +93,7 @@
 
 $UsersPerLoad =30;
 
-$ado = GetADODBConnection();
+$ado = &GetADODBConnection();
     $UserIndex = (int)$_GET["UserIndex"];
     if($UserIndex==0)
     {
Index: trunk/kernel/include/category.php
===================================================================
diff -u -N -r525 -r534
--- trunk/kernel/include/category.php	(.../category.php)	(revision 525)
+++ trunk/kernel/include/category.php	(.../category.php)	(revision 534)
@@ -12,7 +12,7 @@
         global $objSession;
 
         $this->clsItem(TRUE);
-      //$this->adodbConnection = GetADODBConnection();
+      //$this->adodbConnection = &GetADODBConnection();
         $this->tablename = GetTablePrefix()."Category";
         $this->type=1;
         $this->BasePermission ="CATEGORY";
@@ -1345,7 +1345,7 @@
     	$parents = substr($parents, 1, strlen($parents) - 2 );
     	$parents = explode('|', $parents);
     	
-    	$db =& GetADODBConnection();
+    	$db =&GetADODBConnection();
     	$sql = 'UPDATE '.$this->tablename.' SET Modified = '.$date.' WHERE CategoryId IN ('.implode(',', $parents).')';
     	$db->Execute($sql);
     }
@@ -2145,7 +2145,7 @@
    global $$cat_filter;
 
    $filter = $$cat_filter;
-   $adodbConnection = GetADODBConnection();
+   $adodbConnection = &GetADODBConnection();
 
    $sql = "SELECT COUNT(Name) as children from ".$this->SourceTable." where ParentId=" . $ParentID . $filter;
    $result = $adodbConnection->Execute($sql);
@@ -2297,7 +2297,7 @@
 {
     global $objCatList;
 
-   $adodbConnection = GetADODBConnection(); 
+   $adodbConnection = &GetADODBConnection(); 
    $sql = "select CategoryId from ".GetTablePrefix()."Category where ParentId='$Id'";
    $rs = $adodbConnection->Execute($sql);
   
Index: trunk/tools/explang.php
===================================================================
diff -u -N -r13 -r534
--- trunk/tools/explang.php	(.../explang.php)	(revision 13)
+++ trunk/tools/explang.php	(.../explang.php)	(revision 534)
@@ -5,7 +5,7 @@
 include_once("kernel/startup.php");
 LogEntry("System Init Complete\n");
 $fp = fopen($pathtoroot."tools/inportal.lang","w");
-$ado = GetADODBConnection();
+$ado = &GetADODBConnection();
 
 $objLanguages->Query_Item("SELECT * FROM ".$objLanguages->SourceTable);
 foreach($objLanguages->Items as $l)
Index: trunk/admin/config/config_general.php
===================================================================
diff -u -N -r13 -r534
--- trunk/admin/config/config_general.php	(.../config_general.php)	(revision 13)
+++ trunk/admin/config/config_general.php	(.../config_general.php)	(revision 534)
@@ -52,7 +52,7 @@
 <table width="100%" border="0" cellspacing="0" cellpadding="0">
 <tr>
   <?php
-    $adodbConnection = GetADODBConnection();
+    $adodbConnection = &GetADODBConnection();
     $sql="SELECT DISTINCT(Section) FROM ".GetTablePrefix()."ConfigurationValues WHERE ModuleOwner='$config_module'";
     $rs = $adodbConnection->Execute($sql);
     while($rs & !$rs->EOF)
Index: trunk/kernel/include/systemconfiguration.php
===================================================================
diff -u -N -r13 -r534
--- trunk/kernel/include/systemconfiguration.php	(.../systemconfiguration.php)	(revision 13)
+++ trunk/kernel/include/systemconfiguration.php	(.../systemconfiguration.php)	(revision 534)
@@ -13,7 +13,7 @@
 {
     function SystemConfiguration()
     {
-        $adodbConnection = GetADODBConnection();    // create a connection
+        $adodbConnection = &GetADODBConnection();    // create a connection
 
         $sql = sprintf("SELECT DefaultLanguage, DefaultTheme, DBSchemaVersion, SystemSecurityContextId FROM SystemConfiguration");
         $result = $adodbConnection->Execute($sql);
@@ -104,7 +104,7 @@
         if(count($this->m_dirtyFieldsMap) == 0)
             return true;
 
-        $adodbConnection = GetADODBConnection();
+        $adodbConnection = &GetADODBConnection();
 
         $sql = 'UPDATE SystemConfiguration SET ';
         $first  = 1;
@@ -132,7 +132,7 @@
 
     function GetValue($variableName)
     {
-        $adodbConnection = GetADODBConnection();    // create a connection
+        $adodbConnection = &GetADODBConnection();    // create a connection
 
         $sql = sprintf("SELECT VariableValue FROM ConfigurationValues WHERE  VariableName = '%s'",$variableName);
         $result = $adodbConnection->Execute($sql);
@@ -147,7 +147,7 @@
 
     function SetValue($variableName, $variableValue)
     {
-        $adodbConnection = GetADODBConnection();    // create a connection
+        $adodbConnection = &GetADODBConnection();    // create a connection
         if($variableValue == NULL) //Remove field
         {
             $sql = sprintf("DELETE FROM ConfigurationValues WHERE VariableName = '%s'",$variableName);