[Quickfw-git] SF.net Git: quickfw branch, master, updated. 855a0a63ab714a57b3952194ed791f1ea6e0adc4

[Ivan1986 <iva...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "quickfw".

The branch, master has been updated
       via  855a0a63ab714a57b3952194ed791f1ea6e0adc4 (commit)
      from  016c73dc5aa3f4b207f81f465f646fd5282b617e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 855a0a63ab714a57b3952194ed791f1ea6e0adc4
Author: Ivan Borzenkov <iva...@li...>
Date:   Fri Apr 22 00:46:49 2011 +0400

    Фиксы в симпле

diff --git a/lib/DbSimple/Connect.php b/lib/DbSimple/Connect.php
index 719793a..4706069 100644
--- a/lib/DbSimple/Connect.php
+++ b/lib/DbSimple/Connect.php
@@ -123,8 +123,9 @@ class DbSimple_Connect
 		$this->DbSimple = new $class($parsed);
 		$this->errmsg = &$this->DbSimple->errmsg;
 		$this->error = &$this->DbSimple->error;
-		if (isset($parsed['prefix']))
-			$this->DbSimple->setIdentPrefix($parsed['prefix']);
+		$prefix = isset($parsed['prefix']) ? $parsed['prefix'] : ($this->_identPrefix ? $this->_identPrefix : false);
+		if ($prefix)
+			$this->DbSimple->setIdentPrefix($prefix);
 		if ($this->_cachePrefix) $this->DbSimple->setCachePrefix($this->_cachePrefix);
 		if ($this->_cacher) $this->DbSimple->setCacher($this->_cacher);
 		if ($this->_logger) $this->DbSimple->setLogger($this->_logger);
@@ -189,6 +190,7 @@ class DbSimple_Connect
 	/** @var callback обработчик ошибок */
 	private $errorHandler = null;
 	private $_cachePrefix = '';
+	private $_identPrefix = null;
 	private $_logger = null;
 	private $_cacher = null;
 

-----------------------------------------------------------------------

Summary of changes:
 lib/DbSimple/Connect.php |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
quickfw