get the correct context for apitimelinementions

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

diff --git a/lib/arraywrapper.php b/lib/arraywrapper.php
index 424714e908c46f8a6795e9eaff1e75501390f7bc..f9d3c3cf946313d14b35b2ee4cfca2fd1e59a706 100644 (file)
--- a/lib/arraywrapper.php
+++ b/lib/arraywrapper.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -76,6 +76,10 @@ class ArrayWrapper
     function __call($name, $args)
     {
         $item =& $this->_items[$this->_i];
+        if (!is_object($item)) {
+            common_log(LOG_ERR, "Invalid entry " . var_export($item, true) . " at index $this->_i of $this->N; calling $name()");
+            throw new ServerException("Internal error: bad entry in array wrapper list.");
+        }
         return call_user_func_array(array($item, $name), $args);
     }
 }