Merge commit 'refs/merge-requests/31' of https://gitorious.org/social/mainline into...

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

diff --git a/actions/register.php b/actions/register.php
index cf2c049e73ed86580a9801d3a11fdce421f173f2..c97201b666762b67611233e60544a0e134ad78a5 100644 (file)
--- a/actions/register.php
+++ b/actions/register.php
@@ -64,7 +64,7 @@ class RegisterAction extends Action
      * @param $args
      * @return string title
      */
-    function prepare($args)
+    protected function prepare(array $args=array())
     {
         parent::prepare($args);
         $this->code = $this->trimmed('code');
@@ -83,7 +83,7 @@ class RegisterAction extends Action
 
         if (!empty($this->code)) {
             $this->invite = Invitation::getKV('code', $this->code);
-            if (empty($this->invite)) {
+            if (!$this->invite instanceof Invitation) {
             // TRANS: Client error displayed when trying to register to an invite-only site without a valid invitation.
                 $this->clientError(_('Sorry, invalid invitation code.'));
             }
@@ -293,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');