Project

General

Profile

« Previous | Next » 

Revision 1660

Added by Dietmar over 12 years ago

! add group_id to news group overview
  1. fixed Fatal error: Cannot redeclare show_wysiwyg_editor()

View differences:

branches/2.8.x/CHANGELOG
11 11
! = Update/Change
12 12
===============================================================================
13 13

  
14
06 Apr-2012 Build 1660 Dietmar Woellbrink (Luisehahne)
15
! add group_id to news group overview
16
# fixed Fatal error: Cannot redeclare show_wysiwyg_editor()
14 17
06 Apr-2012 Build 1659 Dietmar Woellbrink (Luisehahne)
15 18
! more validation fixes in backend (Tks to Ruebenwurzel)
16 19
05 Apr-2012 Build 1658 Werner v.d.Decken(DarkViper)
branches/2.8.x/wb/admin/interface/version.php
51 51

  
52 52
// check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
53 53
if(!defined('VERSION')) define('VERSION', '2.8.3');
54
if(!defined('REVISION')) define('REVISION', '1659');
54
if(!defined('REVISION')) define('REVISION', '1660');
55 55
if(!defined('SP')) define('SP', '');
branches/2.8.x/wb/modules/wysiwyg/modify.php
32 32
	$content = '';
33 33
}
34 34

  
35
if(!function_exists('show_wysiwyg_editor'))
36
{
37
	if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="none" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php'))
35
if(!isset($wysiwyg_editor_loaded)) {
36
    $wysiwyg_editor_loaded=true;
37
	if(!function_exists('show_wysiwyg_editor'))
38 38
	{
39
		function show_wysiwyg_editor($name,$id,$content,$width,$height)
39
		if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="none" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php'))
40 40
		{
41
			echo '<textarea name="'.$name.'" id="'.$id.'" style="width: '.$width.'; height: '.$height.';">'.$content.'</textarea>';
41
			function show_wysiwyg_editor($name,$id,$content,$width,$height)
42
			{
43
				echo '<textarea name="'.$name.'" id="'.$id.'" style="width: '.$width.'; height: '.$height.';">'.$content.'</textarea>';
44
			}
45
		} else {
46
			require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php');
42 47
		}
43
	} else {
44
		require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php');
45 48
	}
46 49
}
47 50

  
branches/2.8.x/wb/modules/news/modify.php
172 172
					<img src="<?php echo THEME_URL; ?>/images/modify_16.png" border="0" alt="Modify - " />
173 173
				</a>
174 174
			</td>		
175
			<td width="50" style="text-align: right;">
176
				<?php echo $group['group_id'] ?>
177
			</td>
175 178
			<td>
176 179
				<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; ?>">
177 180
					<?php echo $group['title']; ?>
branches/2.8.x/wb/modules/news/modify_post.php
35 35
$query_content = $database->query("SELECT * FROM ".TABLE_PREFIX."mod_news_posts WHERE post_id = '$post_id'");
36 36
$fetch_content = $query_content->fetchRow();
37 37

  
38
if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="none" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php')) {
39
	function show_wysiwyg_editor($name,$id,$content,$width,$height) {
40
		echo '<textarea name="'.$name.'" id="'.$id.'" rows="10" cols="1" style="width: '.$width.'; height: '.$height.';">'.$content.'</textarea>';
38
if(!isset($wysiwyg_editor_loaded)) {
39
    $wysiwyg_editor_loaded=true;
40
	if (!defined('WYSIWYG_EDITOR') OR WYSIWYG_EDITOR=="none" OR !file_exists(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php')) {
41
		function show_wysiwyg_editor($name,$id,$content,$width,$height) {
42
			echo '<textarea name="'.$name.'" id="'.$id.'" rows="10" cols="1" style="width: '.$width.'; height: '.$height.';">'.$content.'</textarea>';
43
		}
44
	} else {
45
		$id_list=array("short","long");
46
		require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php');
41 47
	}
42
} else {
43
	$id_list=array("short","long");
44
	require(WB_PATH.'/modules/'.WYSIWYG_EDITOR.'/include.php');
45 48
}
46 49

  
47 50
// include jscalendar-setup

Also available in: Unified diff