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

diff --cc actions/register.php
index c3cfb8d255d2309e72315c54660a8fbede05338d,033cf557f8959d7ded047794425207e82a1b82ca..dcbbbdb6a6de9afb238715b7ff1cac3d78f40b7d
--- 1/actions/register.php
--- 2/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());