diff options
author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-03 03:33:52 +0000 |
---|---|---|
committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-03 03:33:52 +0000 |
commit | 949a233076ec18f86e60f90a7a8837cb422664af (patch) | |
tree | 0286c9cb2c3301a164505e39dccf02a4e0a98497 /mod/twitterservice/twitterservice_lib.php | |
parent | d4e4268d11612408e4989a5c57f69fcb2febe8aa (diff) | |
download | elgg-949a233076ec18f86e60f90a7a8837cb422664af.tar.gz elgg-949a233076ec18f86e60f90a7a8837cb422664af.tar.bz2 |
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
Diffstat (limited to 'mod/twitterservice/twitterservice_lib.php')
-rw-r--r-- | mod/twitterservice/twitterservice_lib.php | 6 |
1 files changed, 2 insertions, 4 deletions
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(); } |