summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-28 13:54:19 -0500
committerEvan Prodromou <evan@status.net>2010-01-28 13:54:19 -0500
commitd5f86f7a8a113991f050425e411287da4f738ca2 (patch)
tree6b8dc3cc21bea8185a639bf9db17eb09486bed3a /classes
parent84b5480007d30280cc9c829fe1316db0f853f64c (diff)
parente5ff610e755e205f06dbe5ada20fcfac2f2bb669 (diff)
Merge branch 'master' of git@gitorious.org:statusnet/mainline
Diffstat (limited to 'classes')
-rw-r--r--classes/Memcached_DataObject.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index bc9aaf81f..e615f2353 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -430,7 +430,7 @@ class Memcached_DataObject extends DB_DataObject
//
// WARNING WARNING if we end up actually using multiple DBs at a time
// we'll need some fancier logic here.
- if (!$exists && !empty($_DB_DATAOBJECT['CONNECTIONS'])) {
+ if (!$exists && !empty($_DB_DATAOBJECT['CONNECTIONS']) && php_sapi_name() == 'cli') {
foreach ($_DB_DATAOBJECT['CONNECTIONS'] as $index => $conn) {
if (!empty($conn)) {
$conn->disconnect();