Merge branch 'QA_4_5' into QA_4_6

NenadGajic · Feb 12, 2016 · 5042b65 · 5042b65
2 parents bfe0e88 + 4534a90
commit 5042b65
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/index.php b/index.php
@@ -541,7 +541,7 @@
  * Check for existence of config directory which should not exist in
  * production environment.
  */
-if (file_exists('config')) {
+if (@file_exists('config')) {
     trigger_error(
         __(
             'Directory [code]config[/code], which is used by the setup script, ' .
@@ -653,7 +653,7 @@
  *
  * The data file is created while creating release by ./scripts/remove-incomplete-mo
  */
-if (file_exists('libraries/language_stats.inc.php')) {
+if (@file_exists('libraries/language_stats.inc.php')) {
     include 'libraries/language_stats.inc.php';
     /*
      * This message is intentionally not translated, because we're

diff --git a/libraries/Config.php b/libraries/Config.php
@@ -763,7 +763,7 @@ public function checkHTTP($link, $get_body = false)
     public function loadDefaults()
     {
         $cfg = array();
-        if (! file_exists($this->default_source)) {
+        if (! @file_exists($this->default_source)) {
             $this->error_config_default_file = true;
             return false;
         }

diff --git a/libraries/LanguageManager.php b/libraries/LanguageManager.php
@@ -576,7 +576,7 @@ public function listLocaleDir()
                 . '/LC_MESSAGES/phpmyadmin.mo';
             if ($file != "."
                 && $file != ".."
-                && file_exists($path)
+                && @file_exists($path)
             ) {
                 $result[] = $file;
             }

diff --git a/libraries/file_listing.lib.php b/libraries/file_listing.lib.php
@@ -16,7 +16,7 @@
  */
 function PMA_getDirContent($dir, $expression = '')
 {
-    if (!file_exists($dir) || !($handle = @opendir($dir))) {
+    if (!@file_exists($dir) || !($handle = @opendir($dir))) {
         return false;
     }
 

diff --git a/libraries/plugins/auth/AuthenticationCookie.php b/libraries/plugins/auth/AuthenticationCookie.php
@@ -101,7 +101,7 @@ public function auth()
         $header->disableMenuAndConsole();
         $header->disableWarnings();
 
-        if (file_exists(CUSTOM_HEADER_FILE)) {
+        if (@file_exists(CUSTOM_HEADER_FILE)) {
             include CUSTOM_HEADER_FILE;
         }
         echo '
@@ -249,7 +249,7 @@ public function auth()
             echo '</div>';
         }
         echo '</div>';
-        if (file_exists(CUSTOM_FOOTER_FILE)) {
+        if (@file_exists(CUSTOM_FOOTER_FILE)) {
             include CUSTOM_FOOTER_FILE;
         }
         if (! defined('TESTSUITE')) {

diff --git a/libraries/plugins/auth/AuthenticationHttp.php b/libraries/plugins/auth/AuthenticationHttp.php
@@ -101,7 +101,7 @@ public function authForm()
         );
         $response->addHTML('</h3>');
 
-        if (file_exists(CUSTOM_FOOTER_FILE)) {
+        if (@file_exists(CUSTOM_FOOTER_FILE)) {
             include CUSTOM_FOOTER_FILE;
         }
 

diff --git a/libraries/plugins/auth/swekey/swekey.auth.lib.php b/libraries/plugins/auth/swekey/swekey.auth.lib.php
@@ -22,7 +22,7 @@ function Swekey_Auth_check()
         $_SESSION['SWEKEY'] = array();
     }
 
-    $_SESSION['SWEKEY']['ENABLED'] = (! empty($confFile) && file_exists($confFile));
+    $_SESSION['SWEKEY']['ENABLED'] = (! empty($confFile) && @file_exists($confFile));
 
     // Load the swekey.conf file the first time
     if ($_SESSION['SWEKEY']['ENABLED']
@@ -167,7 +167,7 @@ function timedCheck()
         //            echo "<!-- exists -->\n";
     }
 
-    if (file_exists($caFile)) {
+    if (@file_exists($caFile)) {
         Swekey_SetCAFile($caFile);
     } elseif (! empty($caFile)
         && (substr($_SESSION['SWEKEY']['CONF_SERVER_CHECK'], 0, 8) == "https://")

diff --git a/libraries/plugins/export/ExportPdf.php b/libraries/plugins/export/ExportPdf.php
@@ -19,7 +19,7 @@
 /**
  * Skip the plugin if TCPDF is not available.
  */
-if (!file_exists(TCPDF_INC)) {
+if (!@file_exists(TCPDF_INC)) {
     $GLOBALS['skip_import'] = true;
     return;
 }

diff --git a/libraries/plugins/schema/pdf/PdfRelationSchema.php b/libraries/plugins/schema/pdf/PdfRelationSchema.php
@@ -14,7 +14,7 @@
 /**
  * Skip the plugin if TCPDF is not available.
  */
-if (! file_exists(TCPDF_INC)) {
+if (! @file_exists(TCPDF_INC)) {
     $GLOBALS['skip_import'] = true;
     return;
 }