Merge remote-tracking branch 'friendika/master'

[friendica.git] / index.php

diff --git a/index.php b/index.php
index a0a0bc7795977f21afaceb357fac620b80fc9270..0c40c07296284cdcdc7cc59a5f7bfeb2adf0d932 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,7 +1,5 @@
 <?php
 
-error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
 /**
  *
  * Friendika
@@ -196,6 +194,12 @@ if(strlen($a->module)) {
         */
 
        if(! $a->module_loaded) {
+
+               // Stupid browser tried to pre-fetch our ACL img template. Don't log the event or return anything - just quietly exit.
+               if((x($_SERVER,'QUERY_STRING')) && strpos($_SERVER['QUERY_STRING'],'{0}') !== false) {
+                       killme();
+               }
+
                if((x($_SERVER,'QUERY_STRING')) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) {
                        logger('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']);
                        goaway($a->get_baseurl() . $_SERVER['REQUEST_URI']);
@@ -326,5 +330,4 @@ else
        require_once(str_replace($lang . '/', '', $template));
 
 session_write_close();
-closedb();
 exit;