Merge branch 'master' into stable

Conflicts:
	doku.php

1 files changed, 1 insertions, 9 deletions

diff --git a/bin/indexer.php b/bin/indexer.php
index 6ee0a9e8d..4bfd1682e 100755
--- a/bin/indexer.php
+++ b/bin/indexer.php
@@ -86,16 +86,8 @@ function _index($id){
     global $CLEAR;
     global $QUIET;
 
-    // if not cleared only update changed and new files
-    if($CLEAR){
-        $idxtag = metaFN($id,'.indexed');
-        if(@file_exists($idxtag)){
-            @unlink($idxtag);
-        }
-    }
-
     _quietecho("$id... ");
-    idx_addPage($id, !$QUIET);
+    idx_addPage($id, !$QUIET, $CLEAR);
     _quietecho("done.\n");
 }