Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1659)
+++ branches/2.8.x/CHANGELOG	(revision 1660)
@@ -11,6 +11,9 @@
 ! = Update/Change
 ===============================================================================
 
+06 Apr-2012 Build 1660 Dietmar Woellbrink (Luisehahne)
+! add group_id to news group overview
+# fixed Fatal error: Cannot redeclare show_wysiwyg_editor()
 06 Apr-2012 Build 1659 Dietmar Woellbrink (Luisehahne)
 ! more validation fixes in backend (Tks to Ruebenwurzel)
 05 Apr-2012 Build 1658 Werner v.d.Decken(DarkViper)
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1659)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1660)
@@ -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', '1659');
+if(!defined('REVISION')) define('REVISION', '1660');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/modules/wysiwyg/modify.php
===================================================================
--- branches/2.8.x/wb/modules/wysiwyg/modify.php	(revision 1659)
+++ branches/2.8.x/wb/modules/wysiwyg/modify.php	(revision 1660)
@@ -32,16 +32,19 @@
 	$content = '';
 }
 
-if(!function_exists('show_wysiwyg_editor'))
-{
-	if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="none" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php'))
+if(!isset($wysiwyg_editor_loaded)) {
+    $wysiwyg_editor_loaded=true;
+	if(!function_exists('show_wysiwyg_editor'))
 	{
-		function show_wysiwyg_editor($name,$id,$content,$width,$height)
+		if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="none" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php'))
 		{
-			echo '<textarea name="'.$name.'" id="'.$id.'" style="width: '.$width.'; height: '.$height.';">'.$content.'</textarea>';
+			function show_wysiwyg_editor($name,$id,$content,$width,$height)
+			{
+				echo '<textarea name="'.$name.'" id="'.$id.'" style="width: '.$width.'; height: '.$height.';">'.$content.'</textarea>';
+			}
+		} else {
+			require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php');
 		}
-	} else {
-		require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php');
 	}
 }
 
Index: branches/2.8.x/wb/modules/news/modify.php
===================================================================
--- branches/2.8.x/wb/modules/news/modify.php	(revision 1659)
+++ branches/2.8.x/wb/modules/news/modify.php	(revision 1660)
@@ -172,6 +172,9 @@
 					<img src="<?php echo THEME_URL; ?>/images/modify_16.png" border="0" alt="Modify - " />
 				</a>
 			</td>		
+			<td width="50" style="text-align: right;">
+				<?php echo $group['group_id'] ?>
+			</td>
 			<td>
 				<a href="<?php echo WB_URL; ?>/modules/news/modify_group.php?page_id=<?php echo $page_id; ?>&amp;section_id=<?php echo $section_id; ?>&amp;group_id=<?php echo $gid; ?>">
 					<?php echo $group['title']; ?>
Index: branches/2.8.x/wb/modules/news/modify_post.php
===================================================================
--- branches/2.8.x/wb/modules/news/modify_post.php	(revision 1659)
+++ branches/2.8.x/wb/modules/news/modify_post.php	(revision 1660)
@@ -35,13 +35,16 @@
 $query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE post_id = '$post_id'");
 $fetch_content = $query_content->fetchRow();
 
-if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="none" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php')) {
-	function show_wysiwyg_editor($name,$id,$content,$width,$height) {
-		echo '<textarea name="'.$name.'" id="'.$id.'" rows="10" cols="1" style="width: '.$width.'; height: '.$height.';">'.$content.'</textarea>';
+if(!isset($wysiwyg_editor_loaded)) {
+    $wysiwyg_editor_loaded=true;
+	if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="none" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php')) {
+		function show_wysiwyg_editor($name,$id,$content,$width,$height) {
+			echo '<textarea name="'.$name.'" id="'.$id.'" rows="10" cols="1" style="width: '.$width.'; height: '.$height.';">'.$content.'</textarea>';
+		}
+	} else {
+		$id_list=array("short","long");
+		require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php');
 	}
-} else {
-	$id_list=array("short","long");
-	require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php');
 }
 
 // include jscalendar-setup