Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1500)
+++ branches/2.8.x/CHANGELOG	(revision 1501)
@@ -12,6 +12,8 @@
 
 =============================== FEATURES FREEZE ================================
 ----------------------------------- Fixes 2.8.2 --------------------------------
+11 Aug-2011 Build 1501 Werner v.d.Decken(DarkViper)
+- removed stoneaged code from 2.4
 11 Aug-2011 Build 1500 Werner v.d.Decken(DarkViper)
 # sync working copy
 11 Aug-2011 Build 1499 Werner v.d.Decken(DarkViper)
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1500)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1501)
@@ -52,4 +52,4 @@
 
 // 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.2');
-if(!defined('REVISION')) define('REVISION', '1500');
+if(!defined('REVISION')) define('REVISION', '1501');
Index: branches/2.8.x/wb/framework/frontend.functions.php
===================================================================
--- branches/2.8.x/wb/framework/frontend.functions.php	(revision 1500)
+++ branches/2.8.x/wb/framework/frontend.functions.php	(revision 1501)
@@ -1,5 +1,5 @@
 <?php
-/**
+/**$extra_sql
  *
  * @category        framework
  * @package         frontend.functions
@@ -29,11 +29,7 @@
 	$page_description = $wb->page_description;
 	$page_keywords    = $wb->page_keywords;
 	$page_link        = $wb->link;
-// ---------- //
-// extra_sql is not used anymore - this is basically a register_globals exploit prevention...
-	$extra_sql       = $wb->extra_sql;
-	$extra_where_sql = $wb->extra_where_sql;
-// ---------- //
+
 	$include_head_link_css = '';
 	$include_body_links    = '';
 	$include_head_links    = '';
@@ -664,21 +660,3 @@
 		}
 		return $content;
 	}
-
-// Begin WB < 2.4.x template compatibility code
-	// Make extra_sql accessable through private_sql
-	$private_sql = $extra_sql;
-	$private_where_sql = $extra_where_sql;
-	// Query pages for menu
-	$sql  = 'SELECT `page_id`,`menu_title`,`page_title`,`link`,`target`,`visibility`'.$extra_sql.' ';
-	$sql .= 'FROM `'.TABLE_PREFIX.'pages` ';
-	$sql .= 'WHERE `parent`=0 AND '.$extra_where_sql.' ';
-	$sql .= 'ORDER BY `position` ASC';
-	$menu1 = $database->query($sql);
-	// Check if current pages is a parent page and if we need its submenu
-	$tmp = (PARENT == 0 ? PAGE_ID : PARENT);
-	$sql  = 'SELECT `page_id`,`menu_title`,`page_title`,`link`,`target`,`visibility`'.$extra_sql.' ';
-	$sql .= 'FROM `'.TABLE_PREFIX.'pages` ';
-	$sql .= 'WHERE `parent`='.$tmp.' AND '.$extra_where_sql.' ';
-	$sql .= 'ORDER BY `position` ASC';
-	$menu2 = $database->query($sql);