diff --git a/CHANGELOG b/CHANGELOG
index 3f6678227..c4bebdb3d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -31,6 +31,7 @@
 - take out last empty line from view/bootstrap/class.Search.php which causes a
   header to be send to early (Closes: #252, #254) 
 - regular users with sufficient access rights may remove documents via webdav
+- fix error in utils/indexer.php when new documents were indexed
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.25
diff --git a/SeedDMS_Preview/Preview/Previewer.php b/SeedDMS_Preview/Preview/Previewer.php
index dd41a7ebc..20a0c907e 100644
--- a/SeedDMS_Preview/Preview/Previewer.php
+++ b/SeedDMS_Preview/Preview/Previewer.php
@@ -93,7 +93,9 @@ class SeedDMS_Preview_Previewer {
 		do {
 			$timeleft = $timeout - time();
 			$read = array($pipes[1]);
-			stream_select($read, $write = NULL, $exeptions = NULL, $timeleft, 200000);
+			$write = NULL;
+			$exeptions = NULL;
+			stream_select($read, $write, $exeptions, $timeleft, 200000);
 					 
 			if (!empty($read)) {
 				$output .= fread($pipes[1], 8192);
diff --git a/SeedDMS_Preview/package.xml b/SeedDMS_Preview/package.xml
index 5130e59d9..dac0947e3 100644
--- a/SeedDMS_Preview/package.xml
+++ b/SeedDMS_Preview/package.xml
@@ -11,11 +11,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2016-03-29</date>
- <time>08:07:14</time>
+ <date>2016-04-05</date>
+ <time>15:17:11</time>
  <version>
-  <release>1.1.7</release>
-  <api>1.1.7</api>
+  <release>1.1.8</release>
+  <api>1.1.8</api>
  </version>
  <stability>
   <release>stable</release>
@@ -23,12 +23,16 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
+<<<<<<< HEAD
 - Converters to create preview images are no longer fixed. Those which has been hardcoded before remain the predefined converters, but they can also be changed.
 - command for creating the preview will be called with a given timeout
 add method getFilesize()
 timeout for external commands can be passed to contructor of SeedDMS_Preview_Previewer
 check if object passed to createPreview(), hasPreview() is not null
 set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
+=======
+pass variables to stream_select (required by php7)
+>>>>>>> seeddms-5.0.x
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -185,5 +189,21 @@ timeout for external commands can be passed to contructor of SeedDMS_Preview_Pre
 check if object passed to createPreview(), hasPreview() is not null
    </notes>
   </release>
+  <release>
+   <date>2016-03-29</date>
+   <time>08:07:14</time>
+   <version>
+    <release>1.1.7</release>
+    <api>1.1.7</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+set last parameter of stream_select() to 200000 micro sec. in case the timeout in sec. is set to 0
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/inc/inc.Settings.php b/inc/inc.Settings.php
index b855a068d..53b9005ed 100644
--- a/inc/inc.Settings.php
+++ b/inc/inc.Settings.php
@@ -2,7 +2,7 @@
 //    MyDMS. Document Management System
 //    Copyright (C) 2002-2005  Markus Westphal
 //    Copyright (C) 2006-2008 Malcolm Cowe
-//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2010 Matteo Lucarelli
 //
 //    This program is free software; you can redistribute it and/or modify
 //    it under the terms of the GNU General Public License as published by
diff --git a/utils/indexer.php b/utils/indexer.php
index 5b7fc36cf..05d0d6a37 100644
--- a/utils/indexer.php
+++ b/utils/indexer.php
@@ -98,13 +98,12 @@ function tree($dms, $index, $indexconf, $folder, $indent='') { /* {{{ */
 			if($created >= $content->getDate()) {
 				echo " (Document unchanged)\n";
 			} else {
-				if($index->delete($hit->id)) {
-					try {
-						$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false, $settings->_cmdTimeout));
-						echo " (Document updated)\n";
-					} catch(Exception $e) {
-						echo " (Timeout)\n";
-					}
+				$index->delete($hit->id);
+				try {
+					$index->addDocument(new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, false, $settings->_cmdTimeout));
+					echo " (Document updated)\n";
+				} catch(Exception $e) {
+					echo " (Timeout)\n";
 				}
 			}
 		}