#1141

inc/classes/BxDolAccountQuery.php

@@ -32,7 +32,7 @@ class BxDolAccountQuery extends BxDolDb implements iBxDolSingleton
     /**
      * Get singleton instance of the class
      */
-    public static function getInstance($aDbConf = false, &$sError = NULL)
+    public static function getInstance()
     {
         if(!isset($GLOBALS['bxDolClasses'][__CLASS__]))
             $GLOBALS['bxDolClasses'][__CLASS__] = new BxDolAccountQuery();

inc/classes/BxDolAclQuery.php

@@ -33,7 +33,7 @@ class BxDolAclQuery extends BxDolDb implements iBxDolSingleton
     /**
      * Get singleton instance of the class
      */
-    static function getInstance($aDbConf = false, &$sError = NULL)
+    static function getInstance()
     {
         if(!isset($GLOBALS['bxDolClasses'][__CLASS__]))
             $GLOBALS['bxDolClasses'][__CLASS__] = new BxDolAclQuery();

inc/classes/BxDolCronQuery.php

@@ -33,7 +33,7 @@ class BxDolCronQuery extends BxDolDb implements iBxDolSingleton
     /**
      * Get singleton instance of the class
      */
-    static function getInstance($aDbConf = false, &$sError = NULL)
+    static function getInstance()
     {
         if(!isset($GLOBALS['bxDolClasses'][__CLASS__]))
             $GLOBALS['bxDolClasses'][__CLASS__] = new BxDolCronQuery();

inc/classes/BxDolDb.php

@@ -101,7 +101,13 @@ class BxDolDb extends BxDolFactory implements iBxDolSingleton
     /**
      * Get singleton instance of the class
      */
-    public static function getInstance($aDbConf = false, &$sError = null)
+    public static function getInstance()
+    {
+        $null = null;
+        return self::getInstanceWithConf(false, $null);
+    }
+    
+    public static function getInstanceWithConf($aDbConf, &$sError)
     {
         if(!isset($GLOBALS['bxDolClasses'][__CLASS__])) {
             if($aDbConf === false && !defined('BX_DATABASE_HOST'))

inc/classes/BxDolEmailTemplatesQuery.php

@@ -13,7 +13,7 @@
  */
 class BxDolEmailTemplatesQuery extends BxDolDb implements iBxDolSingleton
 {
-    public static function getInstance($aDbConf = false, &$sError = NULL)
+    public static function getInstance()
     {
         if (!isset($GLOBALS['bxDolClasses'][__CLASS__])) {
             $o = new BxDolEmailTemplatesQuery();

inc/classes/BxDolLanguagesQuery.php

@@ -29,7 +29,7 @@ class BxDolLanguagesQuery extends BxDolDb implements iBxDolSingleton
     /**
      * Get singleton instance of the class
      */
-    static function getInstance($aDbConf = false, &$sError = NULL)
+    static function getInstance()
     {
         if(!isset($GLOBALS['bxDolClasses'][__CLASS__]))
             $GLOBALS['bxDolClasses'][__CLASS__] = new BxDolLanguagesQuery();

inc/classes/BxDolModuleQuery.php

@@ -28,7 +28,7 @@ class BxDolModuleQuery extends BxDolDb implements iBxDolSingleton
     /**
      * Get singleton instance of the class
      */
-    public static function getInstance($aDbConf = false, &$sError = NULL)
+    public static function getInstance()
     {
         $sClass = __CLASS__;
         if(!isset($GLOBALS['bxDolClasses'][__CLASS__]))

inc/classes/BxDolPermalinks.php

@@ -95,7 +95,7 @@ class BxDolPermalinks extends BxDolDb implements iBxDolSingleton
     /**
      * Get singleton instance of the class
      */
-    public static function getInstance($aDbConf = false, &$sError = NULL)
+    public static function getInstance()
     {
         if(!isset($GLOBALS['bxDolClasses'][__CLASS__]))
             $GLOBALS['bxDolClasses'][__CLASS__] = new BxDolPermalinks();

inc/classes/BxDolProfileQuery.php

@@ -32,7 +32,7 @@ class BxDolProfileQuery extends BxDolDb implements iBxDolSingleton
     /**
      * Get singleton instance of the class
      */
-    public static function getInstance($aDbConf = false, &$sError = NULL)
+    public static function getInstance()
     {
         if(!isset($GLOBALS['bxDolClasses'][__CLASS__]))
             $GLOBALS['bxDolClasses'][__CLASS__] = new BxDolProfileQuery();

inc/classes/BxDolPush.php

@@ -35,7 +35,7 @@ class BxDolPush extends BxDolDb implements iBxDolSingleton
     /**
      * Get singleton instance of the class
      */
-    public static function getInstance($aDbConf = false, &$sError = NULL)
+    public static function getInstance()
     {
         if(!isset($GLOBALS['bxDolClasses'][__CLASS__]))
             $GLOBALS['bxDolClasses'][__CLASS__] = new BxDolPush();

install/classes/BxDolInstallSiteConfig.php

@@ -323,7 +323,7 @@ EOF;
                 $aDbConf[$this->_aConfig[$sKey]['db_conf']] = $a[$sKey];
 
         $sErrorMessage = '';
-        $oDb = BxDolDb::getInstance($aDbConf, $sErrorMessage);
+        $oDb = BxDolDb::getInstanceWithConf($aDbConf, $sErrorMessage);
         if (!$oDb) {
             $aErrorFields = array();
             if (isset($this->_aDbErrorMap[$sErrorMessage])) {

studio/classes/BxDolStudioWidgetsQuery.php

@@ -29,7 +29,7 @@ class BxDolStudioWidgetsQuery extends BxDolStudioPageQuery implements iBxDolSing
     /**
      * Get singleton instance of the class
      */
-    public static function getInstance($aDbConf = false, &$sError = NULL)
+    public static function getInstance()
     {
         $sClass = __CLASS__;
         if (!isset($GLOBALS['bxDolClasses'][__CLASS__]))

studio/template/scripts/BxBaseStudioFunctions.php

@@ -18,7 +18,7 @@ class BxBaseStudioFunctions extends BxBaseFunctions implements iBxDolSingleton
         parent::__construct($oTemplate ? $oTemplate : BxDolStudioTemplate::getInstance());
     }
 
-    public static function getInstance($oTemplate = null)
+    public static function getInstance()
     {
         if (!isset($GLOBALS['bxDolClasses']['BxBaseStudioFunctions']))
             $GLOBALS['bxDolClasses']['BxBaseStudioFunctions'] = new BxTemplStudioFunctions();

template/scripts/BxBaseFunctions.php

@@ -31,13 +31,18 @@ class BxBaseFunctions extends BxDolFactory implements iBxDolSingleton
             trigger_error('Clone is not allowed for the class: ' . get_class($this), E_USER_ERROR);
     }
 
-    public static function getInstance($oTemplate = null)
+    public static function getInstanceWithTemplate($oTemplate)
     {
         if(!isset($GLOBALS['bxDolClasses']['BxTemplFunctions']))
             $GLOBALS['bxDolClasses']['BxTemplFunctions'] = new BxTemplFunctions($oTemplate);
 
         return $GLOBALS['bxDolClasses']['BxTemplFunctions'];
     }
+    
+    public static function getInstance()
+    {
+        return self::getInstanceWithTemplate(null);
+    }
 
     function TemplPageAddComponent($sKey)
     {