From: Brion Vibber <brion@pobox.com>
Date: Sat, 18 Dec 2010 01:13:21 +0000 (-0800)
Subject: Merge branch '0.9.x' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d8a3a88ec8eae3134694c98e5a9ae42bc30b289f;p=quix0rs-gnu-social.git

Merge branch '0.9.x' into 1.0.x

Conflicts:
	classes/Memcached_DataObject.php
---

d8a3a88ec8eae3134694c98e5a9ae42bc30b289f
diff --cc classes/Memcached_DataObject.php
index 27bb5d3c9d,eb5d2627f2..f71bfd3da0
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@@ -338,11 -338,10 +338,15 @@@ class Memcached_DataObject extends Safe
          }
  
          $start = microtime(true);
 +        $fail = false;
-         try {
-             $result = parent::_query($string);
-         } catch (Exception $e) {
-             $fail = $e;
+         $result = null;
+         if (Event::handle('StartDBQuery', array($this, $string, &$result))) {
 -            $result = parent::_query($string);
++            try {
++                $result = parent::_query($string);
++            } catch (Exception $e) {
++                $fail = $e;
++            }
+             Event::handle('EndDBQuery', array($this, $string, &$result));
          }
          $delta = microtime(true) - $start;