diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-22 14:18:40 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-22 14:18:40 -0500 |
| commit | e666433eb4a66078e3459d7d4f51f5ce5a1ad589 (patch) | |
| tree | cda4a38651ef7f2970935d37463bccd50d90a2db /classes | |
| parent | 373206ac0042c37624844fb738ff869fa7190041 (diff) | |
| parent | a3e484a0e898bb94dd45cd7807bea1a931d7c6a9 (diff) | |
Merge branch 'master' into 0.9.x
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/Memcached_DataObject.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php index 4ecab9db6..6ddef4816 100644 --- a/classes/Memcached_DataObject.php +++ b/classes/Memcached_DataObject.php @@ -19,8 +19,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } -require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; - class Memcached_DataObject extends DB_DataObject { /** @@ -353,7 +351,7 @@ class Memcached_DataObject extends DB_DataObject unset($_DB_DATAOBJECT['CONNECTIONS'][$index]); } } - + $result = parent::_connect(); if ($result && !$exists) { |