Merge branch '1.0.x' into msn-plugin

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

diff --git a/actions/register.php b/actions/register.php
index e386a8fc8ad30ff3cd6d7cc0cc6a39c952071890..1bcd3edc171958ccc193b9af1016cff454efcc7e 100644 (file)
--- a/actions/register.php
+++ b/actions/register.php
@@ -69,13 +69,6 @@ class RegisterAction extends Action
         parent::prepare($args);
         $this->code = $this->trimmed('code');
 
-        // @todo this check should really be in index.php for all sensitive actions
-        $ssl = common_config('site', 'ssl');
-        if (empty($_SERVER['HTTPS']) && ($ssl == 'always' || $ssl == 'sometimes')) {
-            common_redirect(common_local_url('register'));
-            // exit
-        }
-
         if (empty($this->code)) {
             common_ensure_session();
             if (array_key_exists('invitecode', $_SESSION)) {
@@ -613,4 +606,12 @@ class RegisterAction extends Action
         $nav = new LoginGroupNav($this);
         $nav->show();
     }
+
+    function showNoticeForm()
+    {
+    }
+
+    function showProfileBlock()
+    {
+    }
 }