Project

General

Profile

« Previous | Next » 

Revision 1185

Added by Dietmar over 14 years ago

fix show_menu2 include.php, page crashes, if php error_log is disabled

View differences:

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

  
13 13
------------------------------------- 2.8.1 -------------------------------------
14
25-Nov-2009 Dietmar Woellbrink (Luisehahne)
15
!	fix show_menu2 include.php, page crashes, if php error_log is disabled
16
25-Nov-2009 Dietmar Woellbrink (Luisehahne)
17
!	fixes language files HU.php and SK.php
14 18
24-Nov-2009 Dietmar Woellbrink (Luisehahne)
15
+ 	add to constants in /framework/initialize.php for later feature in database settings
19
!	fixed php 5.3 depricated function in show_menu2
20
24-Nov-2009 Dietmar Woellbrink (Luisehahne)
21
+ 	add two constants in /framework/initialize.php for later feature in database settings
16 22
+	define('EDIT_ONE_SECTION', true) to edit only one section with editor in manage sections
17 23
	modify page will be loading all sections with editor
18 24
+	define('EDITOR_WIDTH', 900) set min width for editor
......
31 37
+	added forgotten jquery-fancybox.js Version 1.0
32 38
13-Oct-2009 Dietrich Roland Pehlke (Aldus)
33 39
#	Fixed typo in the finnish language file (ticket #814).
34
>>>>>>> .r1169
35 40
12-Oct-2009 Dietmar Woellbrink
36 41
!	security update FCKeditor (tks to Ruebenwurzel)
37 42
12-Oct-2009 Dietmar Woellbrink
......
3180 3185
+	Added search functionality, with three different "methods":
3181 3186
	1. Using all words  2. Using any words  3. Exact match
3182 3187
+	Added native MySQL database support
3183
>>>>>>> .r1147
3188

  
branches/2.8.x/wb/modules/show_menu2/include.php
270 270
                $rgTests[$n] = $this->ifTest($rgMatches[1], $rgMatches[2], $rgMatches[3]);
271 271
            }
272 272
            else {
273
                error_log("show_menu2 error: conditional expression is invalid!");
273
                @error_log("show_menu2 error: conditional expression is invalid!");
274 274
                $rgTests[$n] = false;
275 275
            }
276 276
        }
......
429 429
    else {
430 430
        $flags = SM2_TRIM;
431 431
        $aOptions = array();
432
        error_log('show_menu2 error: $aOptions is invalid. No flags supplied!');
432
        @error_log('show_menu2 error: $aOptions is invalid. No flags supplied!');
433 433
    }
434 434
    
435
    // ensure we have our group 1 flag, we don't check for the "exactly 1" part, but 
435
    // ensure we have our group 1 flag, we don't check for the "exactly 1" part, but
436 436
    // we do ensure that they provide at least one.
437 437
    if (0 == ($flags & _SM2_GROUP_1)) {
438
        error_log('show_menu2 error: $aOptions is invalid. No flags from group 1 supplied!');
438
        @error_log('show_menu2 error: $aOptions is invalid. No flags from group 1 supplied!');
439 439
        $flags |= SM2_TRIM; // default to TRIM
440 440
    }
441 441
    

Also available in: Unified diff