aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-08-28 03:25:42 -0700
committerfriendica <info@friendica.com>2012-08-28 03:25:42 -0700
commitda49a27aa24b6a85b2623134884d933dc04e201b (patch)
treea72e047a222fb3b8a6371c7ebbf557ee51502f8c
parent9cd1dabe73f7bd01473848f55cb4595494837ac9 (diff)
downloadvolse-hubzilla-da49a27aa24b6a85b2623134884d933dc04e201b.tar.gz
volse-hubzilla-da49a27aa24b6a85b2623134884d933dc04e201b.tar.bz2
volse-hubzilla-da49a27aa24b6a85b2623134884d933dc04e201b.zip
make home redirection and register link work again
-rw-r--r--mod/home.php9
-rw-r--r--view/tpl/login.tpl2
2 files changed, 4 insertions, 7 deletions
diff --git a/mod/home.php b/mod/home.php
index 0320c1b39..42669988e 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -6,11 +6,8 @@ function home_init(&$a) {
$ret = array();
call_hooks('home_init',$ret);
- if(local_user() && ($a->user['nickname']))
- goaway( $a->get_baseurl() . "/profile/" . $a->user['nickname'] );
-
- if(strlen(get_config('system','singleuser')))
- goaway( $a->get_baseurl() . "/profile/" . get_config('system','singleuser'));
+ if(local_user() && ($a->identity['entity_address']))
+ goaway( $a->get_baseurl() . '/profile/' . $a->identity['entity_address']);
}}
@@ -27,7 +24,7 @@ function home_content(&$a) {
if(file_exists('home.html'))
$o .= file_get_contents('home.html');
- $o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
+ $o .= login(($a->config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
call_hooks("home_content",$o);
diff --git a/view/tpl/login.tpl b/view/tpl/login.tpl
index 9f098c1d4..94dd85eeb 100644
--- a/view/tpl/login.tpl
+++ b/view/tpl/login.tpl
@@ -8,7 +8,7 @@
</div>
<div id="login-extra-links">
- {{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
+ {{ if $register }}<a href="zregister" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
<a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
</div>