From 949a233076ec18f86e60f90a7a8837cb422664af Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Thu, 3 Feb 2011 03:33:52 +0000
Subject: Refs #2428 almost done removing CONFIG access - mostly plugin
 start.php left

git-svn-id: http://code.elgg.org/elgg/trunk@7999 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/twitterservice/twitterservice_lib.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'mod/twitterservice/twitterservice_lib.php')

diff --git a/mod/twitterservice/twitterservice_lib.php b/mod/twitterservice/twitterservice_lib.php
index 5f8768949..0251a9208 100644
--- a/mod/twitterservice/twitterservice_lib.php
+++ b/mod/twitterservice/twitterservice_lib.php
@@ -26,21 +26,19 @@ function twitterservice_allow_sign_on_with_twitter() {
 }
 
 function twitterservice_forward() {
-	global $CONFIG;
 	
 	// sanity check
 	if (!twitterservice_allow_sign_on_with_twitter()) {
 		forward();
 	}
 	
-	$callback = "{$CONFIG->site->url}pg/twitterservice/login";
+	$callback = elgg_normalize_url("pg/twitterservice/login");
 	$request_link = twitterservice_get_authorize_url($callback);
 	
 	forward($request_link);
 }
 
 function twitterservice_login() {
-	global $CONFIG;
 	
 	// sanity check
 	if (!twitterservice_allow_sign_on_with_twitter()) {
@@ -79,7 +77,7 @@ function twitterservice_login() {
 		// create new user
 		if (!$user) {
 			// check new registration allowed
-			if (!$CONFIG->allow_registration) {
+			if (!elgg_get_config('allow_registration')) {
 				register_error(elgg_echo('registerdisabled'));
 				forward();
 			}
-- 
cgit v1.2.3