use \!empty() rather than error suppression

apppies · Mar 6, 2014 · b7a3421 · b7a3421
1 parent e1ecd6f
commit b7a3421
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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']);