Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1691)
+++ branches/2.8.x/CHANGELOG	(revision 1692)
@@ -11,6 +11,9 @@
 ! = Update/Change
 ===============================================================================
 
+08 Aug-2012 Build 1692 Werner v.d.Decken(DarkViper)
+# corrected pageID in forwarding links
+! changed request of permission to ami_group_member() and is_group_match()
 10 Jun-2012 Build 1691 Werner v.d.Decken(DarkViper)
 # fixed the order of loading languages
 31 May-2012 Build 1690 Werner v.d.Decken(DarkViper)
Index: branches/2.8.x/wb/admin/pages/save.php
===================================================================
--- branches/2.8.x/wb/admin/pages/save.php	(revision 1691)
+++ branches/2.8.x/wb/admin/pages/save.php	(revision 1692)
@@ -67,18 +67,9 @@
 $sql .= 'WHERE `page_id` = '.$page_id;
 $results = $database->query($sql);
 $results_array = $results->fetchRow();
-$old_admin_groups = explode(',', str_replace('_', '', $results_array['admin_groups']));
-$old_admin_users = explode(',', str_replace('_', '', $results_array['admin_users']));
-$in_old_group = FALSE;
-foreach($admin->get_groups_id() as $cur_gid)
+if(!$admin->ami_group_member($results_array['admin_users']) && 
+   !$admin->is_group_match($admin->get_groups_id(), $results_array['admin_groups']))
 {
-    if (in_array($cur_gid, $old_admin_groups))
-    {
-        $in_old_group = TRUE;
-    }
-}
-if((!$in_old_group) && !is_numeric(array_search($admin->get_user_id(), $old_admin_users)))
-{
 	$admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']);
 }
 // Get page module
@@ -85,20 +76,9 @@
 $sql  = 'SELECT `module` FROM `'.TABLE_PREFIX.'sections` ';
 $sql .= 'WHERE `page_id`='.$page_id.' AND `section_id`='.$section_id;
 $module = $database->get_one($sql);
-if(!$module)
-{
+if(!$module) {
 	$admin->print_error( $database->is_error() ? $database->get_error() : $MESSAGE['PAGES']['NOT_FOUND']);
 }
-//$results = $database->query($sql);
-//if($database->is_error()) {
-//	$admin->print_error($database->get_error());
-//}
-//if($results->numRows() == 0) {
-//	$admin->print_error($MESSAGE['PAGES']['NOT_FOUND']);
-//}
-//$results_array = $results->fetchRow();
-//$module = $results_array['module'];
-
 // Update the pages table
 $now = time();
 $sql  = 'UPDATE `'.TABLE_PREFIX.'pages` SET ';
@@ -114,9 +94,9 @@
 // Check if there is a db error, otherwise say successful
 if($database->is_error())
 {
-	$admin->print_error($database->get_error(), ADMIN_URL.'/pages/modify.php?page_id='.$results_array['page_id'] );
+	$admin->print_error($database->get_error(), ADMIN_URL.'/pages/modify.php?page_id='.$page_id );
 } else {
-	$admin->print_success($MESSAGE['PAGES']['SAVED'], ADMIN_URL.'/pages/modify.php?page_id='.$results_array['page_id'] );
+	$admin->print_success($MESSAGE['PAGES']['SAVED'], ADMIN_URL.'/pages/modify.php?page_id='.$page_id );
 }
 
 // Print admin footer
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1691)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1692)
@@ -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', '1691');
+if(!defined('REVISION')) define('REVISION', '1692');
 if(!defined('SP')) define('SP', '');
