Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1934)
+++ branches/2.8.x/CHANGELOG	(revision 1935)
@@ -11,6 +11,9 @@
 ! = Update/Change
 ===============================================================================
 
+24 Jul-2013 Build 1935 M.v.d.Decken(DarkViper)
+# /upgrade_script.php fixed headers_sent problem
+# /search/search_modext.php fixed problem with output buffer
 22 Jul-2013 Build 1934 M.v.d.Decken(DarkViper)
 ! /account/signup added posibility for different mailto address
 ! /install/save.php modified internal comment
Index: branches/2.8.x/wb/upgrade-script.php
===================================================================
--- branches/2.8.x/wb/upgrade-script.php	(revision 1934)
+++ branches/2.8.x/wb/upgrade-script.php	(revision 1935)
@@ -20,7 +20,7 @@
  * 
  * 
  * @category     Core
- * @package      Core_package
+ * @package      Core_service
  * @subpackage   upgrade-script
  * @author       Dietmar Wöllbrink <dietmar.woellbrink@websitebaker.org>
  * @author       Werner v.d.Decken <wkl@isteam.de>
@@ -341,7 +341,7 @@
 //}
 
 // delete remember key cookie if set
-if (isset($_COOKIE['REMEMBER_KEY'])) {
+if (isset($_COOKIE['REMEMBER_KEY']) && !headers_sent() ) {
 	setcookie('REMEMBER_KEY', '', time() - 3600, '/');
 }
 
@@ -355,7 +355,7 @@
 // overwrite session array
 $_SESSION = array();
 // delete session cookie if set
-if (isset($_COOKIE[session_name()])) {
+if (isset($_COOKIE[session_name()]) && !headers_sent()) {
     setcookie(session_name(), '', time() - 42000, '/');
 }
 // delete the session itself
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1934)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1935)
@@ -51,5 +51,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.3');
-if(!defined('REVISION')) define('REVISION', '1934');
+if(!defined('REVISION')) define('REVISION', '1935');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/search/search_modext.php
===================================================================
--- branches/2.8.x/wb/search/search_modext.php	(revision 1934)
+++ branches/2.8.x/wb/search/search_modext.php	(revision 1935)
@@ -323,7 +323,7 @@
 	);
 	echo str_replace($vars, $values, $func_results_loop_string);
 	if($func_enable_flush) { // ATTN: this will bypass output-filters and may break template-layout or -filters
-		ob_flush();flush();
+//		ob_flush();flush();
 	}
 	return true;
 }