Changeset 558 for trunk/lib/App.inc.php

Timestamp:

Dec 30, 2015 5:11:44 AM (8 years ago)

Author:

anonymous

Message:

Minor fixes

File:

• trunk/lib/App.inc.php (modified) (2 diffs)

trunk/lib/App.inc.php

@@ -1486 +1486 @@
         }
 
-        if (!isset($_SESSION['_app'][$this->_ns]['boomerang'])) {
-            $this->logMsg(sprintf('validBoomerangURL(%s) no boomerang URL set.', $id), LOG_DEBUG, __FILE__, __LINE__);
+        if (!isset($_SESSION['_app'][$this->_ns]['boomerang']) || !is_array($_SESSION['_app'][$this->_ns]['boomerang']) || empty($_SESSION['_app'][$this->_ns]['boomerang'])) {
+            $this->logMsg(sprintf('validBoomerangURL(%s) no boomerang URL set, not an array, or empty.', $id), LOG_DEBUG, __FILE__, __LINE__);
             return false;
         }
@@ -1496 +1496 @@
             $added_time = $_SESSION['_app'][$this->_ns]['boomerang'][$id]['added_time'];
         } else if (!isset($id) || $use_nonspecificboomerang) {
-            // Use non specific boomerang if available.
+            // Use most recent, non-specific boomerang if available.
             $url = end($_SESSION['_app'][$this->_ns]['boomerang'])['url'];
             $added_time = end($_SESSION['_app'][$this->_ns]['boomerang'])['added_time'];