Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1292)
+++ branches/2.8.x/CHANGELOG	(revision 1293)
@@ -12,6 +12,8 @@
  
 ------------------------------------- 2.8.1 -------------------------------------
 19-Feb-2010 Dietmar Woellbrink (Luisehahne)
+!	change show_menu2 to correct modul version 4.9
+19-Feb-2010 Dietmar Woellbrink (Luisehahne)
 !	insert $wb->preprocess($output), preprocess no longer needed in modules
 !	little modifaction in upgrade-script.php in function check_wb_tables
 !	updated module wysiwyg, set to module version 2.8
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1292)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1293)
@@ -52,6 +52,6 @@
 
 // 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.x');
-if(!defined('REVISION')) define('REVISION', '1292');
+if(!defined('REVISION')) define('REVISION', '1293');
 
 ?>
\ No newline at end of file
Index: branches/2.8.x/wb/modules/show_menu2/info.php
===================================================================
--- branches/2.8.x/wb/modules/show_menu2/info.php	(revision 1292)
+++ branches/2.8.x/wb/modules/show_menu2/info.php	(revision 1293)
@@ -1,47 +1,27 @@
-<?php
-
-// $Id$
-
-/*
-    show_menu2: show_menu replacement for Website Baker 
-    Copyright (C) 2006-2009, Brodie Thiesfield
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
-    02110-1301, USA.
-    
-    THANKS
-    ======
-    Thanks to the following people:
-
-        Stuart Fraser
-          * Original request for a better menu system
-
-        Ezra Peisach
-          * Bug fixes
-
-        Thorn
-          * Added support for WB 2.7 multiple groups and publish by date
-    
-*/
-
-$module_directory = 'show_menu2';
-$module_name = 'show_menu2';
-$module_function = 'snippet';
-$module_version = '4.9';
-$module_platform = '2.7 | 2.8.x';
-$module_author = 'Brodie Thiesfield';
-$module_license = 'GNU General Public License';
-$module_description = 'A code snippet for the Website Baker CMS providing a complete replacement for the builtin menu functions. See <a href="http://code.jellycan.com/show_menu2/" target="_blank">http://code.jellycan.com/show_menu2/</a> for details or view the <a href="' .WB_URL .'/modules/show_menu2/README.en.txt" target="_blank">readme</a> file.';
+<?php
+/**
+ *
+ * @category        module
+ * @package         show_menu2
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2010, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.7.0 | 2.8.x
+ * @requirements    PHP 4.4.9 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+$module_directory = 'show_menu2';
+$module_name = 'show_menu2';
+$module_function = 'snippet';
+$module_version = '4.9';
+$module_platform = '2.7 | 2.8.x';
+$module_author = 'Brodie Thiesfield';
+$module_license = 'GNU General Public License';
+$module_description = 'A code snippet for the Website Baker CMS providing a complete replacement for the builtin menu functions. See <a href="http://code.jellycan.com/show_menu2/" target="_blank">http://code.jellycan.com/show_menu2/</a> for details or view the <a href="' .WB_URL .'/modules/show_menu2/README.en.txt" target="_blank">readme</a> file.';
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/show_menu2/info.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/show_menu2/include.php
===================================================================
--- branches/2.8.x/wb/modules/show_menu2/include.php	(revision 1292)
+++ branches/2.8.x/wb/modules/show_menu2/include.php	(revision 1293)
@@ -1,31 +1,21 @@
 <?php
+/**
+ *
+ * @category        module
+ * @package         show_menu2
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2010, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.7.0 | 2.8.x
+ * @requirements    PHP 4.4.9 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
 
-// $Id$
-
-/*
-    show_menu2: show_menu replacement for Website Baker 
-    Copyright (C) 2006-2009, Brodie Thiesfield
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
-    02110-1301, USA.
-
-    ***********************************************
-    ** Version 4.8: see README for documentation **
-    ***********************************************
-*/
-
 define('SM2_ROOT',       -1000);
 define('SM2_CURR',       -2000);
 define('SM2_ALLMENU',       -1);
@@ -43,6 +33,7 @@
 define('SM2_NOESCAPE',       0); // NOOP, unnecessary with WB 2.6.7+
 define('SM2_BUFFER',    0x0200); // bit 9
 define('SM2_CURRTREE',  0x0400); // bit 10
+define('SM2_SHOWHIDDEN', 0x0800); // bit 11
 
 define('_SM2_GROUP_1',  0x000F); // exactly one flag from group 1 is required
 
@@ -588,7 +579,11 @@
                 if ($page['page_id'] == $CURR_PAGE_ID) {
                     $page['sm2_is_curr'] = true;
                     $page['sm2_on_curr_path'] = true;
-                    unset($page['sm2_hide']); // don't hide the current page
+                    if ($flags & SM2_SHOWHIDDEN) 
+					{ 
+                        // show hidden pages if active and SHOWHIDDEN flag supplied
+                        unset($page['sm2_hide']); 
+                    }
                 }
 
                 // mark parents of the current page as such
@@ -595,7 +590,11 @@
                 if (in_array($page['page_id'], $rgCurrParents)) {
                     $page['sm2_is_parent'] = true;
                     $page['sm2_on_curr_path'] = true;
-                    unset($page['sm2_hide']); // don't hide a parent page                
+                    if ($flags & SM2_SHOWHIDDEN) 
+					{
+                        // show hidden pages if active and SHOWHIDDEN flag supplied
+						unset($page['sm2_hide']); // don't hide a parent page                
+                    }
                 }
                 
                 // add the entry to the array                

Property changes on: branches/2.8.x/wb/modules/show_menu2/include.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/show_menu2/legacy.php
===================================================================
--- branches/2.8.x/wb/modules/show_menu2/legacy.php	(revision 1292)
+++ branches/2.8.x/wb/modules/show_menu2/legacy.php	(revision 1293)
@@ -1,28 +1,22 @@
 <?php
+/**
+ *
+ * @category        module
+ * @package         show_menu2
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2010, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.7.0 | 2.8.x
+ * @requirements    PHP 4.4.9 and higher
+ * @version         $Id$
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
 
-// $Id$
-
 /*
-    show_menu2: show_menu replacement for Website Baker 
-    Copyright (C) 2006-2009, Brodie Thiesfield
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
-    02110-1301, USA.
-*/
-
-/*
     This file provides backward compatibility between show_menu2 and the
     old functions show_menu() and menu(). Note that it is highly recommended 
     for you to update your templates to use show_menu2 directly.

Property changes on: branches/2.8.x/wb/modules/show_menu2/legacy.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property
Index: branches/2.8.x/wb/modules/show_menu2/index.php
===================================================================
--- branches/2.8.x/wb/modules/show_menu2/index.php	(revision 1292)
+++ branches/2.8.x/wb/modules/show_menu2/index.php	(revision 1293)
@@ -1,27 +1,21 @@
-<?php
-
-// $Id$
-
-/*
-    show_menu2: show_menu replacement for Website Baker 
-    Copyright (C) 2006-2009, Brodie Thiesfield
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  
-    02110-1301, USA.
-*/
-
-header('Location: ../index.php');
-
+<?php
+/**
+ *
+ * @category        module
+ * @package         show_menu2
+ * @author          WebsiteBaker Project
+ * @copyright       2004-2009, Ryan Djurovich
+ * @copyright       2009-2010, Website Baker Org. e.V.
+ * @link			http://www.websitebaker2.org/
+ * @license         http://www.gnu.org/licenses/gpl.html
+ * @platform        WebsiteBaker 2.7.0 | 2.8.x
+ * @requirements    PHP 4.4.9 and higher
+ * @version         $Id$ 
+ * @filesource		$HeadURL$
+ * @lastmodified    $Date$
+ *
+ */
+
+header('Location: ../index.php');
+
 ?>
\ No newline at end of file

Property changes on: branches/2.8.x/wb/modules/show_menu2/index.php
___________________________________________________________________
Modified: svn:keywords
## -1 +1,4 ##
-Id
\ No newline at end of property
+Id
+Revision
+HeadURL
+Date
\ No newline at end of property