Refs #2804 #2805 pulling changes in trunk from 1.7 branch

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

diff --git a/engine/lib/database.php b/engine/lib/database.php
index d024270295c25d2a0b6c5db13861e36df01b2ab7..973e63e53055db87a8be2f166d7ade65e55b291e 100644 (file)
--- a/engine/lib/database.php
+++ b/engine/lib/database.php
@@ -19,6 +19,7 @@
  *
  * @global array $DB_QUERY_CACHE
  */
+global $DB_QUERY_CACHE;
 $DB_QUERY_CACHE = array();
 
 /**
@@ -38,6 +39,7 @@ $DB_QUERY_CACHE = array();
  *
  * @global array $DB_DELAYED_QUERIES
  */
+global $DB_DELAYED_QUERIES;
 $DB_DELAYED_QUERIES = array();
 
 /**
@@ -48,6 +50,7 @@ $DB_DELAYED_QUERIES = array();
  *
  * @global array $dblink
  */
+global $dblink;
 $dblink = array();
 
 /**
@@ -57,6 +60,7 @@ $dblink = array();
  *
  * @global integer $dbcalls
  */
+global $dbcalls;
 $dbcalls = 0;
 
 /**

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 0efc9c364cece2cdb96661632865924e324d767f..aebaf17242e063eee2f4e27cff189ab580d06b02 100644 (file)
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -13,6 +13,7 @@
  * @global array $ENTITY_CACHE
  * @access private
  */
+global $ENTITY_CACHE;
 $ENTITY_CACHE = array();
 
 /**
@@ -21,6 +22,7 @@ $ENTITY_CACHE = array();
  * @global array $SUBTYPE_CACHE
  * @access private
  */
+global $SUBTYPE_CACHE;
 $SUBTYPE_CACHE = NULL;
 
 /**

diff --git a/engine/lib/metastrings.php b/engine/lib/metastrings.php
index 8a105b82234a59febe104bd7f9973972d297cb38..229adb0ed0b21a62e1fe95bcef47e67b52699a46 100644 (file)
--- a/engine/lib/metastrings.php
+++ b/engine/lib/metastrings.php
@@ -8,9 +8,11 @@
  */
 
 /** Cache metastrings for a page */
+global $METASTRINGS_CACHE;
 $METASTRINGS_CACHE = array();
 
 /** Keep a record of strings we know don't exist */
+global $METASTRINGS_DEADNAME_CACHE;
 $METASTRINGS_DEADNAME_CACHE = array();
 
 /**

diff --git a/engine/lib/notification.php b/engine/lib/notification.php
index 5b53a4a1092097cf3ff58d02917adba845017a64..44539d8b5a08be65e229f988a3b9d23d15c87b31 100644 (file)
--- a/engine/lib/notification.php
+++ b/engine/lib/notification.php
@@ -19,6 +19,7 @@
  */
 
 /** Notification handlers */
+global $NOTIFICATION_HANDLERS;
 $NOTIFICATION_HANDLERS = array();
 
 /**

diff --git a/engine/lib/pam.php b/engine/lib/pam.php
index f6db28355c09f4ad4b529f60cd28737abdc7588e..37e709a8afb3ee1ac1696bdfbdf5da0f1b3694b9 100644 (file)
--- a/engine/lib/pam.php
+++ b/engine/lib/pam.php
@@ -20,6 +20,7 @@
  * @subpackage Authentication.PAM
  */
 
+global $_PAM_HANDLERS;
 $_PAM_HANDLERS = array();
 
 /**

diff --git a/engine/lib/users.php b/engine/lib/users.php
index dcdad31931b0fac8e83d15512c580831127c5e4f..8d00eee2fdddd4ad0b2602fbf09ae14f0f71e6b5 100644 (file)
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -8,9 +8,11 @@
  */
 
 /// Map a username to a cached GUID
+global $USERNAME_TO_GUID_MAP_CACHE;
 $USERNAME_TO_GUID_MAP_CACHE = array();
 
 /// Map a user code to a cached GUID
+global $CODE_TO_GUID_MAP_CACHE;
 $CODE_TO_GUID_MAP_CACHE = array();
 
 /**

diff --git a/engine/lib/web_services.php b/engine/lib/web_services.php
index f928dc29a36438c615c8cee426b7b4ebc8d2a67c..e70359fa81a4c34cf5358d95c9e345df7eb699de 100644 (file)
--- a/engine/lib/web_services.php
+++ b/engine/lib/web_services.php
@@ -29,6 +29,7 @@
  *             )
  *  )
  */
+global $API_METHODS;
 $API_METHODS = array();
 
 /**

diff --git a/engine/lib/xml-rpc.php b/engine/lib/xml-rpc.php
index 6c1084f7009f7f95544fe23de5ff1911b603ee7b..b63d626df2877b44019cd6abd5f009d489c98487 100644 (file)
--- a/engine/lib/xml-rpc.php
+++ b/engine/lib/xml-rpc.php
@@ -86,6 +86,7 @@ function xmlrpc_scalar_value($object) {
 // Functions for adding handlers //////////////////////////////////////////////////////////
 
 /** XML-RPC Handlers */
+global $XML_RPC_HANDLERS;
 $XML_RPC_HANDLERS = array();
 
 /**