From 79e79377626799a77c11aa7849cb9c64305590c8 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Wed, 7 Jan 2015 10:47:45 +0100
Subject: Remove error supression for file_exists()

In an older version of PHP a file_exists() call would issue a warning
when the file did not exist. This was fixed in later PHP releases. Since
we require PHP 5.3 now, there's no need to supress any error here
anymore. This might even give a minor performance boost.
---
 lib/exe/css.php     |  6 +++---
 lib/exe/detail.php  |  2 +-
 lib/exe/indexer.php |  4 ++--
 lib/exe/js.php      | 12 ++++++------
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'lib/exe')

diff --git a/lib/exe/css.php b/lib/exe/css.php
index b1065f518..e0bc68312 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -365,11 +365,11 @@ function css_interwiki(){
     $iwlinks = getInterwiki();
     foreach(array_keys($iwlinks) as $iw){
         $class = preg_replace('/[^_\-a-z0-9]+/i','_',$iw);
-        if(@file_exists(DOKU_INC.'lib/images/interwiki/'.$iw.'.png')){
+        if(file_exists(DOKU_INC.'lib/images/interwiki/'.$iw.'.png')){
             echo "a.iw_$class {";
             echo '  background-image: url('.DOKU_BASE.'lib/images/interwiki/'.$iw.'.png)';
             echo '}';
-        }elseif(@file_exists(DOKU_INC.'lib/images/interwiki/'.$iw.'.gif')){
+        }elseif(file_exists(DOKU_INC.'lib/images/interwiki/'.$iw.'.gif')){
             echo "a.iw_$class {";
             echo '  background-image: url('.DOKU_BASE.'lib/images/interwiki/'.$iw.'.gif)';
             echo '}';
@@ -451,7 +451,7 @@ class DokuCssFile {
      * @return  string               the CSS/Less contents of the file
      */
     public function load($location='') {
-        if (!@file_exists($this->filepath)) return '';
+        if (!file_exists($this->filepath)) return '';
 
         $css = io_readFile($this->filepath);
         if (!$location) return $css;
diff --git a/lib/exe/detail.php b/lib/exe/detail.php
index cc29d5b87..ec1a9b874 100644
--- a/lib/exe/detail.php
+++ b/lib/exe/detail.php
@@ -37,7 +37,7 @@ $AUTH = auth_quickaclcheck($IMG);
 if($AUTH >= AUTH_READ){
     // check if image exists
     $SRC = mediaFN($IMG,$REV); 
-    if(!@file_exists($SRC)){
+    if(!file_exists($SRC)){
         //doesn't exist!
         http_status(404);
         $ERROR = 'File not found';
diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php
index 89c4b7cd0..330b8498d 100644
--- a/lib/exe/indexer.php
+++ b/lib/exe/indexer.php
@@ -68,9 +68,9 @@ function runTrimRecentChanges($media_changes = false) {
     // Trims the recent changes cache to the last $conf['changes_days'] recent
     // changes or $conf['recent'] items, which ever is larger.
     // The trimming is only done once a day.
-    if (@file_exists($fn) &&
+    if (file_exists($fn) &&
         (@filemtime($fn.'.trimmed')+86400)<time() &&
-        !@file_exists($fn.'_tmp')) {
+        !file_exists($fn.'_tmp')) {
             @touch($fn.'.trimmed');
             io_lock($fn);
             $lines = file($fn);
diff --git a/lib/exe/js.php b/lib/exe/js.php
index 793104e81..3f9781e34 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -160,7 +160,7 @@ function js_out(){
  * @param string $file filename path to file
  */
 function js_load($file){
-    if(!@file_exists($file)) return;
+    if(!file_exists($file)) return;
     static $loaded = array();
 
     $data = io_readFile($file);
@@ -179,7 +179,7 @@ function js_load($file){
 
         if($ifile{0} != '/') $ifile = dirname($file).'/'.$ifile;
 
-        if(@file_exists($ifile)){
+        if(file_exists($ifile)){
             $idata = io_readFile($ifile);
         }else{
             $idata = '';
@@ -221,10 +221,10 @@ function js_pluginstrings() {
     $plugins = plugin_list();
     foreach ($plugins as $p){
         if (isset($lang)) unset($lang);
-        if (@file_exists(DOKU_PLUGIN."$p/lang/en/lang.php")) {
+        if (file_exists(DOKU_PLUGIN."$p/lang/en/lang.php")) {
             include DOKU_PLUGIN."$p/lang/en/lang.php";
         }
-        if (isset($conf['lang']) && $conf['lang']!='en' && @file_exists(DOKU_PLUGIN."$p/lang/".$conf['lang']."/lang.php")) {
+        if (isset($conf['lang']) && $conf['lang']!='en' && file_exists(DOKU_PLUGIN."$p/lang/".$conf['lang']."/lang.php")) {
             include DOKU_PLUGIN."$p/lang/".$conf['lang']."/lang.php";
         }
         if (isset($lang['js'])) {
@@ -245,10 +245,10 @@ function js_pluginstrings() {
 function js_templatestrings() {
     global $conf;
     $templatestrings = array();
-    if (@file_exists(tpl_incdir()."lang/en/lang.php")) {
+    if (file_exists(tpl_incdir()."lang/en/lang.php")) {
         include tpl_incdir()."lang/en/lang.php";
     }
-    if (isset($conf['lang']) && $conf['lang']!='en' && @file_exists(tpl_incdir()."lang/".$conf['lang']."/lang.php")) {
+    if (isset($conf['lang']) && $conf['lang']!='en' && file_exists(tpl_incdir()."lang/".$conf['lang']."/lang.php")) {
         include tpl_incdir()."lang/".$conf['lang']."/lang.php";
     }
     if (isset($lang['js'])) {
-- 
cgit v1.2.3