Email notify-on-fave moved to Profile_prefs (run upgrade.php)

[quix0rs-gnu-social.git] / actions / register.php

diff --git a/actions/register.php b/actions/register.php
index 7c372892df8c27b57e8eacb3cf839885619b7527..82fb9fc5736a97fa16c9be69bbdfb236e3303bee 100644 (file)
--- a/actions/register.php
+++ b/actions/register.php
@@ -79,7 +79,6 @@ class RegisterAction extends Action
         if (common_config('site', 'inviteonly') && empty($this->code)) {
             // TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
             $this->clientError(_('Sorry, only invited people can register.'));
-            return false;
         }
 
         if (!empty($this->code)) {
@@ -87,7 +86,6 @@ class RegisterAction extends Action
             if (empty($this->invite)) {
             // TRANS: Client error displayed when trying to register to an invite-only site without a valid invitation.
                 $this->clientError(_('Sorry, invalid invitation code.'));
-                return false;
             }
             // Store this in case we need it
             common_ensure_session();
@@ -187,7 +185,6 @@ class RegisterAction extends Action
             if (common_config('site', 'inviteonly') && !($code && $invite)) {
                 // TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
                 $this->clientError(_('Sorry, only invited people can register.'));
-                return;
             }
 
             // Input scrubbing
@@ -296,14 +293,14 @@ class RegisterAction extends Action
         }
     }
 
-    // overrided to add hentry, and content-inner class
+    // overrided to add h-entry, and content-inner class
     function showContentBlock()
     {
-        $this->elementStart('div', array('id' => 'content', 'class' => 'hentry'));
+        $this->elementStart('div', array('id' => 'content', 'class' => 'h-entry'));
         $this->showPageTitle();
         $this->showPageNoticeBlock();
         $this->elementStart('div', array('id' => 'content_inner',
-                                         'class' => 'entry-content'));
+                                         'class' => 'e-content'));
         // show the actual content (forms, lists, whatever)
         $this->showContent();
         $this->elementEnd('div');
@@ -387,7 +384,6 @@ class RegisterAction extends Action
         if (common_config('site', 'inviteonly') && !($code && $invite)) {
             // TRANS: Client error displayed when trying to register to an invite-only site without an invitation.
             $this->clientError(_('Sorry, only invited people can register.'));
-            return;
         }
 
         $this->elementStart('form', array('method' => 'post',