Refs #2673 moved changes into trunk from 1.7 branch

git-svn-id: http://code.elgg.org/elgg/trunk@7417 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/database.php b/engine/lib/database.php
index 3170f3ac15ccbff5083d7f867ea9587c892e3c3e..da068effdc3ccac5bf5f7549fe4185c876200743 100644 (file)
--- a/engine/lib/database.php
+++ b/engine/lib/database.php
@@ -156,7 +156,7 @@ function db_profiling_shutdown_hook() {
  * @return void
  */
 function db_delayedexecution_shutdown_hook() {
-       global $DB_DELAYED_QUERIES, $CONFIG;
+       global $DB_DELAYED_QUERIES;
 
        foreach ($DB_DELAYED_QUERIES as $query_details) {
                // use one of our db functions so it is included in profiling.

diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index 3649fddb7b5cc1bf9fd79db7e3eb013bd08dc945..c0ec7f389f278397ea6b16a92e40367cbff76a89 100644 (file)
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -837,9 +837,11 @@ function is_plugin_enabled($plugin, $site_guid = 0) {
                $ENABLED_PLUGINS_CACHE = $enabled_plugins;
        }
 
-       foreach ($ENABLED_PLUGINS_CACHE as $e) {
-               if ($e == $plugin) {
-                       return true;
+       if (is_array($ENABLED_PLUGINS_CACHE)) {
+               foreach ($ENABLED_PLUGINS_CACHE as $e) {
+                       if ($e == $plugin) {
+                               return true;
+                       }
                }
        }