Refs #2428 removed a few CONFIG uses in core

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

diff --git a/actions/user/passwordreset.php b/actions/user/passwordreset.php
index 230dfd68fcd383f757b96bfe78a5d6176b326d34..201d6abcf0a5d6061279786146c0a2548e43d579 100644 (file)
--- a/actions/user/passwordreset.php
+++ b/actions/user/passwordreset.php
@@ -6,8 +6,6 @@
  * @subpackage Core
  */
 
-global $CONFIG;
-
 $user_guid = get_input('u');
 $code = get_input('c');
 

diff --git a/actions/usersettings/save.php b/actions/usersettings/save.php
index 29cbebc1abcf6f47f4a1783c17c413a6f563c13d..eb6cdbd5d25833887af8c06491915481d8543559 100644 (file)
--- a/actions/usersettings/save.php
+++ b/actions/usersettings/save.php
@@ -6,8 +6,6 @@
  * @subpackage UserSettings
  */
 
-global $CONFIG;
-
 elgg_trigger_plugin_hook('usersettings:save', 'user');
 
 forward(REFERER);

diff --git a/pages/account/register.php b/pages/account/register.php
index f18061dfcf1660fa4ac8b7be29c80656e922e622..76319e0d6d3e293fbd67853bb7db59cfd5eb1843 100644 (file)
--- a/pages/account/register.php
+++ b/pages/account/register.php
@@ -15,16 +15,16 @@
 /**
  * Start the Elgg engine
  *
- * Why? In the case this file is called thru a page handler: $CONFIG
- * is not within the global scope (the page handler function does not include it).
- * BUT, there _might_ exist direct calls to this file, requiring the engine
+ * Why?
+ * Tthere _might_ exist direct calls to this file, requiring the engine
  * to be started. Logic for both cases follow.
+ *
+ * @todo remove as direct calls were deprecated in 1.7
  */
 require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-global $CONFIG;
 
 // check new registration allowed
-if (!$CONFIG->allow_registration) {
+if (elgg_get_config('allow_registration') == false) {
        register_error(elgg_echo('registerdisabled'));
        forward();
 }
@@ -38,8 +38,10 @@ if (isloggedin()) {
 }
 
 $area1 = elgg_view_title(elgg_echo("register"));
-$area2 = elgg_view("account/forms/register",
-               array('friend_guid' => $friend_guid, 'invitecode' => $invitecode));
+$area2 = elgg_view("account/forms/register", array(
+       'friend_guid' => $friend_guid,
+       'invitecode' => $invitecode)
+);
 
 $body = elgg_view_layout("one_column_with_sidebar", array('content' => $area1 . $area2));
 echo elgg_view_page(elgg_echo("register"), $body);

diff --git a/pages/dashboard/latest.php b/pages/dashboard/latest.php
index 973a3f8be213135ee3bd215d40a14fd6901b34dd..201f1e8043cfee03cf338325045833191d784d2b 100644 (file)
--- a/pages/dashboard/latest.php
+++ b/pages/dashboard/latest.php
@@ -12,7 +12,6 @@
 require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
 // Load the front page
-global $CONFIG;
 
 if (is_plugin_enabled('riverdashboard')) {
        $title = elgg_view_title(elgg_echo('content:latest'));

diff --git a/pages/friends/pickercallback.php b/pages/friends/pickercallback.php
index 00661c2b1e1a7799ef2ff34a04731882e56e3d4e..3385117082cafcba5cb1b3c54ceedd20e64b033a 100644 (file)
--- a/pages/friends/pickercallback.php
+++ b/pages/friends/pickercallback.php
@@ -8,7 +8,8 @@
 
 // Load Elgg engine
 require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-global $CONFIG;
+
+$site_url = elgg_get_site_url();
 
 // Get callback type (list or picker)
 $type = get_input('type', 'picker');
@@ -45,7 +46,7 @@ switch($type) {
                        'friendspicker' => $friendspicker,
                        'formcontents' => elgg_view('friends/forms/collectionfields',
                                array('collection' => get_access_collection($collection))),
-                       'formtarget' => $CONFIG->wwwroot . 'action/friends/editcollection',
+                       'formtarget' => $site_url . 'action/friends/editcollection',
                ));
                break;
 }