From: Robin Millette <millette@controlyourself.ca>
Date: Sat, 18 Apr 2009 21:14:31 +0000 (+0000)
Subject: fix 0.7.x 0.8.x merge conflict in register.php
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=39c0e3a9ef9c0d82eb5fae54d2aa422e281b24a1;p=quix0rs-gnu-social.git

fix 0.7.x 0.8.x merge conflict in register.php
---

39c0e3a9ef9c0d82eb5fae54d2aa422e281b24a1
diff --cc actions/register.php
index c3cfb8d255,033cf557f8..dcbbbdb6a6
--- a/actions/register.php
+++ b/actions/register.php
@@@ -343,23 -382,10 +382,23 @@@ class RegisterAction extends Actio
  
      function showFormContent()
      {
 +        $code = $this->trimmed('code');
 +
 +        $invite = null;
 +
 +        if ($code) {
 +            $invite = Invitation::staticGet($code);
 +        }
 +
 +        if (common_config('site', 'inviteonly') && !($code && $invite)) {
 +            $this->clientError(_('Sorry, only invited people can register.'));
 +            return;
 +        }
 +
          $this->elementStart('form', array('method' => 'post',
-                     'id' => 'form_register',
-                     'class' => 'form_settings',
-                     'action' => common_local_url('register')));
+                                           'id' => 'form_register',
+                                           'class' => 'form_settings',
+                                           'action' => common_local_url('register')));
          $this->elementStart('fieldset');
          $this->element('legend', null, 'Account settings');
          $this->hidden('token', common_session_token());