eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Merge branch '0.9.x' into 1.0.x

Browse Source 
Conflicts:
	classes/Memcached_DataObject.php
This commit is contained in:
Brion Vibber
2010-12-17 17:13:21 -08:00
parent bf59eaf602 fb8312ebf4
commit d8a3a88ec8
20 changed files with 466 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
classes/Memcached_DataObject.php
View File

@@ -339,10 +339,14 @@ class Memcached_DataObject extends Safe_DataObject
$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))) {
try {
$result = parent::_query($string);
} catch (Exception $e) {
$fail = $e;
}
Event::handle('EndDBQuery', array($this, $string, &$result));
}
$delta = microtime(true) - $start;