Merge branch 'master' into social-master

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

diff --git a/actions/register.php b/actions/register.php
index 26d6c247b3b20f392bb702588a3f5ac9bec4785a..6b7764d37a35d001623da92da2933a32c3daebc5 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(array $args=array())
+    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.'));
             }