Merged stuff from upstream/master

[quix0rs-gnu-social.git] / lib / noresultexception.php

diff --git a/lib/noresultexception.php b/lib/noresultexception.php
index 6eb83b89d264e58b5ff51b6596c6d6b46b8baf8e..2933a351222c2eca4c10eedf7c6193f23241b7cf 100644 (file)
--- a/lib/noresultexception.php
+++ b/lib/noresultexception.php
@@ -20,7 +20,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Exception
- * @package   GNUSocial
+ * @package   GNUsocial
  * @author    Mikael Nordfeldth <mmn@hethane.se>
  * @copyright 2013 Free Software Foundation, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
@@ -31,8 +31,11 @@ if (!defined('GNUSOCIAL')) { exit(1); }
 
 class NoResultException extends ServerException
 {
-    public function __construct(DB_DataObject $obj)
+    public $obj;    // The object with query that gave no results
+
+    public function __construct(Memcached_DataObject $obj)
     {
+        $this->obj = $obj;
         // We could log an entry here with the search parameters
         parent::__construct(sprintf(_('No result found on %s lookup.'), get_class($obj)));
     }