Merge remote branch 'friendica/master' into quattro-fontsoptions

[friendica.git] / mod / register.php

diff --git a/mod/register.php b/mod/register.php
index d52b5a6e10945cf296d14904c6e58b69b620d118..a8fa100c8f9c7109552405e9ea1369f187f8ee63 100644 (file)
--- a/mod/register.php
+++ b/mod/register.php
@@ -12,7 +12,7 @@ function register_post(&$a) {
        call_hooks('register_post', $arr);
 
        $max_dailies = intval(get_config('system','max_daily_registrations'));
-       if($max_dailes) {
+       if($max_dailies) {
                $r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
                if($r && $r[0]['total'] >= $max_dailies) {
                        return;
@@ -182,7 +182,7 @@ function register_content(&$a) {
        }
 
        $max_dailies = intval(get_config('system','max_daily_registrations'));
-       if($max_dailes) {
+       if($max_dailies) {
                $r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
                if($r && $r[0]['total'] >= $max_dailies) {
                        logger('max daily registrations exceeded.');
@@ -193,6 +193,8 @@ function register_content(&$a) {
 
        if(x($_SESSION,'theme'))
                unset($_SESSION['theme']);
+       if(x($_SESSION,'mobile-theme'))
+               unset($_SESSION['mobile-theme']);
 
 
        $username     = ((x($_POST,'username'))     ? $_POST['username']     : ((x($_GET,'username'))     ? $_GET['username']              : ''));
@@ -245,6 +247,8 @@ function register_content(&$a) {
 
        call_hooks('register_form',$arr);
 
+       $o = $arr['template'];
+
        $o = replace_macros($o, array(
                '$oidhtml' => $oidhtml,
                '$invitations' => get_config('system','invitation_only'),