[Quickfw-git] SF.net Git: quickfw branch, master, updated. 07e385c27f06e54d6091567d8dc8743861727777

[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  07e385c27f06e54d6091567d8dc8743861727777 (commit)
      from  b3cff61f428e85c615718d8c7188428e4aa63a7d (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 07e385c27f06e54d6091567d8dc8743861727777
Author: Ivan1986 <iva...@li...>
Date:   Thu Aug 19 17:18:54 2010 +0400

    errorHandler в DbSimple

diff --git a/lib/DbSimple/Connect.php b/lib/DbSimple/Connect.php
index 738f195..d6720ff 100644
--- a/lib/DbSimple/Connect.php
+++ b/lib/DbSimple/Connect.php
@@ -116,7 +116,7 @@ class DbSimple_Connect
 		if (isset($parsed['prefix']))
 			$this->DbSimple->setIdentPrefix($parsed['prefix']);
 		$this->DbSimple->setCachePrefix('db_'.md5($parsed['dsn']).'_');
-		$this->DbSimple->setErrorHandler(array(&$this, 'errorHandler'), false);
+		$this->DbSimple->setErrorHandler($this->errorHandler ? $this->errorHandler : array(&$this, 'errorHandler'), false);
 	}
 
 	/**
@@ -142,6 +142,25 @@ class DbSimple_Connect
 	}
 
 	/**
+	 * Устанавливает новый обработчик ошибок
+	 * Обработчик получает 2 аргумента:
+	 * - сообщение об ошибке
+	 * - массив (код, сообщение, запрос, контекст)
+	 *
+	 * @param callback setErrorHandler(callback $handler)
+	 */
+	public function setErrorHandler($handler)
+	{
+		$prev = $this->errorHandler;
+		$this->errorHandler = $handler;
+		if ($this->DbSimple)
+			return $this->DbSimple->setErrorHandler($handler);
+	}
+
+	/** @var callback обработчик ошибок */
+	private $errorHandler = null;
+
+	/**
 	 * array parseDSN(string $dsn)
 	 * Разбирает строку DSN в массив параметров подключения к базе
 	 */

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

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


hooks/post-receive
-- 
quickfw