Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1916)
+++ branches/2.8.x/CHANGELOG	(revision 1917)
@@ -12,6 +12,9 @@
 ===============================================================================
 
 
+07 Jun-2013 Build 1917 Dietmar Woellbrink (Luisehahne)
+! /modules/show_menu2/  set to version 4.9.7
+  DEBUG == true show query counts
 07 Jun-2013 Build 1916 Dietmar Woellbrink (Luisehahne)
 ! /modules/droplets/ set to version 1.3.0
   installing module with sql import
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1916)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1917)
@@ -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', '1916');
+if(!defined('REVISION')) define('REVISION', '1917');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/modules/show_menu2/info.php
===================================================================
--- branches/2.8.x/wb/modules/show_menu2/info.php	(revision 1916)
+++ branches/2.8.x/wb/modules/show_menu2/info.php	(revision 1917)
@@ -3,15 +3,15 @@
  *
  * @category        module
  * @package         show_menu2
+ * @author          Brodie Thiesfield
  * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
+ * @copyright       2009-2013, WebsiteBaker Org. e.V.
+ * @link            http://www.websitebaker.org/
  * @license         http://www.gnu.org/licenses/gpl.html
- * @platform        WebsiteBaker 2.7.0
+ * @platform        WebsiteBaker 2.8.4
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL$
+ * @filesource      $HeadURL$
  * @lastmodified    $Date$
  *
  */
@@ -19,9 +19,8 @@
 $module_directory = 'show_menu2';
 $module_name = 'show_menu2';
 $module_function = 'snippet';
-$module_version = '4.9.6';
-$module_platform = '2.7 | 2.8.2';
+$module_version = '4.9.7';
+$module_platform = '2.8.4';
 $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.';
-
Index: branches/2.8.x/wb/modules/show_menu2/include.php
===================================================================
--- branches/2.8.x/wb/modules/show_menu2/include.php	(revision 1916)
+++ branches/2.8.x/wb/modules/show_menu2/include.php	(revision 1917)
@@ -4,14 +4,14 @@
  * @category        module
  * @package         show_menu2
  * @author          WebsiteBaker Project
- * @copyright       2004-2009, Ryan Djurovich
- * @copyright       2009-2011, Website Baker Org. e.V.
- * @link			http://www.websitebaker2.org/
+ * @copyright       Brodie Thiesfield
+ * @copyright       2009-2013, WebsiteBaker Org. e.V.
+ * @link            http://www.websitebaker.org/
  * @license         http://www.gnu.org/licenses/gpl.html
  * @platform        WebsiteBaker 2.7.0 | 2.8.x
  * @requirements    PHP 5.2.2 and higher
  * @version         $Id$
- * @filesource		$HeadURL$
+ * @filesource      $HeadURL$
  * @lastmodified    $Date$
  *
  */
@@ -444,7 +444,8 @@
     )
 {
     global $wb;
-
+    $database = WbDatabase::getInstance();
+	$iQueryStart = $database->getQueryCount;
     // extract the flags and set $aOptions to an array
     $flags = 0;
     if (is_int($aOptions)) {
@@ -722,7 +723,10 @@
     if (($flags & SM2_NOCACHE) != 0) {
         unset($GLOBALS['show_menu2_data'][$aMenu]);
     }
-    
+	if(defined('DEBUG') && (DEBUG)) {
+	    $iQueriesDone = $database->getQueryCount - $iQueryStart;
+	    return $retval."\n".'<!-- Queries: '.$iQueriesDone.' -->'."\n";
+	}
     return $retval;
 }