Should not normalize Salmon author URIs.

[quix0rs-gnu-social.git] / index.php

diff --git a/index.php b/index.php
index 2b27845e59dcbce9ed64e69bda2ba9c028a8a2d3..1d0aabb8bb375ea0592ba138e2b3a0ca72a9e5c7 100644 (file)
--- a/index.php
+++ b/index.php
@@ -242,8 +242,6 @@ function main()
     }
     global $user, $action;
 
-    Snapshot::check();
-
     if (!_have_config()) {
         $msg = sprintf(
             // TRANS: Error message displayed when there is no StatusNet configuration file.
@@ -288,7 +286,6 @@ function main()
     // If the request is HTTP and it should be HTTPS...
     if ($site_ssl != 'never' && !StatusNet::isHTTPS() && common_is_sensitive($args['action'])) {
         common_redirect(common_local_url($args['action'], $args));
-        return;
     }
 
     $args = array_merge($args, $_REQUEST);
@@ -299,7 +296,6 @@ function main()
 
     if (!$action || !preg_match('/^[a-zA-Z0-9_-]*$/', $action)) {
         common_redirect(common_local_url('public'));
-        return;
     }
 
     // If the site is private, and they're not on one of the "public"
@@ -326,7 +322,6 @@ function main()
         common_set_returnto(common_local_url($action, $rargs));
 
         common_redirect(common_local_url('login'));
-        return;
     }
 
     $action_class = ucfirst($action).'Action';