From b7a3421a21dcfafa93505b980de9f1cf8fd3532e Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Thu, 6 Mar 2014 20:11:42 +0000
Subject: use \!empty() rather than error suppression

---
 inc/search.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/inc/search.php b/inc/search.php
index 89f3e253d..21666b3fd 100644
--- a/inc/search.php
+++ b/inc/search.php
@@ -351,10 +351,11 @@ function search_universal(&$data,$base,$file,$type,$lvl,$opts){
     $return = true;
 
     // get ID and check if it is a valid one
-    $item['id'] = pathID($file,($type == 'd' || @$opts['keeptxt']));
+    $item['id'] = pathID($file,($type == 'd' || !empty($opts['keeptxt'])));
     if($item['id'] != cleanID($item['id'])){
-        if($opts['showmsg'])
+        if($opts['showmsg']){
             msg(hsc($item['id']).' is not a valid file name for DokuWiki - skipped',-1);
+        }
         return false; // skip non-valid files
     }
     $item['ns']  = getNS($item['id']);
-- 
cgit v1.2.3