aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-01-23 16:54:33 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-01-23 16:54:33 +0000
commit3ffc92b3d7693b669f6d1b4675eba1e6dbde4492 (patch)
treec3006a98442556ea1e819f2df16e10d8d580cc21 /engine
parent5224445f7c0aa192ad5c609b621020b8873e447f (diff)
downloadelgg-3ffc92b3d7693b669f6d1b4675eba1e6dbde4492.tar.gz
elgg-3ffc92b3d7693b669f6d1b4675eba1e6dbde4492.tar.bz2
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
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/database.php4
-rw-r--r--engine/lib/entities.php2
-rw-r--r--engine/lib/metastrings.php2
-rw-r--r--engine/lib/notification.php1
-rw-r--r--engine/lib/pam.php1
-rw-r--r--engine/lib/users.php2
-rw-r--r--engine/lib/web_services.php1
-rw-r--r--engine/lib/xml-rpc.php1
8 files changed, 14 insertions, 0 deletions
diff --git a/engine/lib/database.php b/engine/lib/database.php
index d02427029..973e63e53 100644
--- 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 0efc9c364..aebaf1724 100644
--- 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 8a105b822..229adb0ed 100644
--- 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 5b53a4a10..44539d8b5 100644
--- 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 f6db28355..37e709a8a 100644
--- 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 dcdad3193..8d00eee2f 100644
--- 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 f928dc29a..e70359fa8 100644
--- 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 6c1084f70..b63d626df 100644
--- 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();
/**