aboutsummaryrefslogtreecommitdiff
path: root/pages/account
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-30 02:25:22 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-30 02:25:22 +0000
commitcaef932790b72de1efa5b8ef2065dd3ca3b9eb5a (patch)
tree0a829eeabea8a4c5460ff7eda87bb60c4f3f0395 /pages/account
parent6f59a0482ed182ed3f544ebde84bbcfdcd9b4680 (diff)
downloadelgg-caef932790b72de1efa5b8ef2065dd3ca3b9eb5a.tar.gz
elgg-caef932790b72de1efa5b8ef2065dd3ca3b9eb5a.tar.bz2
Refs #2428 removed a few CONFIG uses in core
git-svn-id: http://code.elgg.org/elgg/trunk@7480 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'pages/account')
-rw-r--r--pages/account/register.php16
1 files changed, 9 insertions, 7 deletions
diff --git a/pages/account/register.php b/pages/account/register.php
index f18061dfc..76319e0d6 100644
--- 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);