X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=c68e8836fdb97bf1e37d772f889b7f97d7512181;hb=017eee8e5d7fb4c976032f6e1b14947254fc073e;hp=76e4cfe71623d3d320b2739aa76aafdb6eba740b;hpb=77d1a680b12a7d301c2144e547fb0cfaa03054e5;p=quix0rs-gnu-social.git

diff --git a/index.php b/index.php
index 76e4cfe716..c68e8836fd 100644
--- a/index.php
+++ b/index.php
@@ -268,7 +268,7 @@ function main()
     $site_ssl = common_config('site', 'ssl');
 
     // If the request is HTTP and it should be HTTPS...
-    if ($site_ssl != 'never' && !StatusNet::isHTTPS() && common_is_sensitive($args['action'])) {
+    if ($site_ssl != 'never' && !GNUsocial::isHTTPS() && common_is_sensitive($args['action'])) {
         common_redirect(common_local_url($args['action'], $args));
     }
 
@@ -317,14 +317,14 @@ function main()
     } else {
         try {
             call_user_func("$action_class::run", $args);
-        } catch (ClientException $cex) {
-            $cac = new ClientErrorAction($cex->getMessage(), $cex->getCode());
+        } catch (ClientException $e) {
+            $cac = new ClientErrorAction($e->getMessage(), $e->getCode());
             $cac->showPage();
-        } catch (ServerException $sex) { // snort snort guffaw
-            $sac = new ServerErrorAction($sex->getMessage(), $sex->getCode(), $sex);
+        } catch (ServerException $e) { // snort snort guffaw
+            $sac = new ServerErrorAction($e->getMessage(), $e->getCode(), $e);
             $sac->showPage();
-        } catch (Exception $ex) {
-            $sac = new ServerErrorAction($ex->getMessage(), 500, $ex);
+        } catch (Exception $e) {
+            $sac = new ServerErrorAction($e->getMessage(), 500, $e);
             $sac->showPage();
         }
     }