Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1184)
+++ branches/2.8.x/CHANGELOG	(revision 1185)
@@ -11,8 +11,14 @@
 ! = Update/Change
 
 ------------------------------------- 2.8.1 -------------------------------------
+25-Nov-2009 Dietmar Woellbrink (Luisehahne)
+!	fix show_menu2 include.php, page crashes, if php error_log is disabled
+25-Nov-2009 Dietmar Woellbrink (Luisehahne)
+!	fixes language files HU.php and SK.php
 24-Nov-2009 Dietmar Woellbrink (Luisehahne)
-+ 	add to constants in /framework/initialize.php for later feature in database settings
+!	fixed php 5.3 depricated function in show_menu2
+24-Nov-2009 Dietmar Woellbrink (Luisehahne)
++ 	add two constants in /framework/initialize.php for later feature in database settings
 +	define('EDIT_ONE_SECTION', true) to edit only one section with editor in manage sections
 	modify page will be loading all sections with editor
 +	define('EDITOR_WIDTH', 900) set min width for editor
@@ -31,7 +37,6 @@
 +	added forgotten jquery-fancybox.js Version 1.0
 13-Oct-2009 Dietrich Roland Pehlke (Aldus)
 #	Fixed typo in the finnish language file (ticket #814).
->>>>>>> .r1169
 12-Oct-2009 Dietmar Woellbrink
 !	security update FCKeditor (tks to Ruebenwurzel)
 12-Oct-2009 Dietmar Woellbrink
@@ -3180,4 +3185,4 @@
 +	Added search functionality, with three different "methods":
 	1. Using all words  2. Using any words  3. Exact match
 +	Added native MySQL database support
->>>>>>> .r1147
+
Index: branches/2.8.x/wb/modules/show_menu2/include.php
===================================================================
--- branches/2.8.x/wb/modules/show_menu2/include.php	(revision 1184)
+++ branches/2.8.x/wb/modules/show_menu2/include.php	(revision 1185)
@@ -270,7 +270,7 @@
                 $rgTests[$n] = $this->ifTest($rgMatches[1], $rgMatches[2], $rgMatches[3]);
             }
             else {
-                error_log("show_menu2 error: conditional expression is invalid!");
+                @error_log("show_menu2 error: conditional expression is invalid!");
                 $rgTests[$n] = false;
             }
         }
@@ -429,13 +429,13 @@
     else {
         $flags = SM2_TRIM;
         $aOptions = array();
-        error_log('show_menu2 error: $aOptions is invalid. No flags supplied!');
+        @error_log('show_menu2 error: $aOptions is invalid. No flags supplied!');
     }
     
-    // ensure we have our group 1 flag, we don't check for the "exactly 1" part, but 
+    // ensure we have our group 1 flag, we don't check for the "exactly 1" part, but
     // we do ensure that they provide at least one.
     if (0 == ($flags & _SM2_GROUP_1)) {
-        error_log('show_menu2 error: $aOptions is invalid. No flags from group 1 supplied!');
+        @error_log('show_menu2 error: $aOptions is invalid. No flags from group 1 supplied!');
         $flags |= SM2_TRIM; // default to TRIM
     }