Index: branches/5.0.x/core/units/categories/categories_event_handler.php
===================================================================
diff -u -r12472 -r12525
--- branches/5.0.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 12472)
+++ branches/5.0.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 12525)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_event_handler.php 12472 2009-09-08 17:42:35Z alex $
+* @version	$Id: categories_event_handler.php 12525 2009-09-16 11:17:05Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1360,6 +1360,9 @@
 
 					if ($object->Update()) {
 						$event->status = erSUCCESS;
+
+						$email_event = $event->Name == 'OnMassApprove' ? 'CATEGORY.APPROVE' : 'CATEGORY.DENY';
+						$this->Application->EmailEventUser($email_event, $object->GetDBField('CreatedById'));
 					}
 					else {
 						$event->status = erFAIL;
Index: branches/5.0.x/core/kernel/event_manager.php
===================================================================
diff -u -r12368 -r12525
--- branches/5.0.x/core/kernel/event_manager.php	(.../event_manager.php)	(revision 12368)
+++ branches/5.0.x/core/kernel/event_manager.php	(.../event_manager.php)	(revision 12525)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: event_manager.php 12368 2009-08-23 21:55:59Z alex $
+* @version	$Id: event_manager.php 12525 2009-09-16 11:17:05Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -560,6 +560,23 @@
 
 			// change opener stack
 			$default_params = Array ('m_opener' => 'u', '__URLENCODE__' => 1);
+
+			if (!$this->Application->ConfigValue('UsePopups') && $wid) {
+				// remove wid to show combined header block in editing window
+				$default_params['m_wid'] = '';
+
+				// move last popup's opener stack elemenent to main window's opener stack
+				if ($opener_stack) {
+					list ($index_file, $env) = explode('|', $opener_stack[ count($opener_stack) - 1 ], 2);
+					$main_params = $this->Application->HttpQuery->processQueryString($env, 'pass');
+					$main_template = $main_params['t'];
+					unset($main_params['t']);
+
+					$main_params = array_merge($main_params, $default_params);
+					$this->openerStackPush($main_template, $main_params, $main_params['pass'], '');
+				}
+			}
+
 			$redirect_params = array_merge_recursive2($default_params, $params);
 			$new_level = $this->Application->BuildEnv($template, $redirect_params, $pass, true);
 			array_push($opener_stack, 'index.php|' . ltrim($new_level, ENV_VAR_NAME . '=') );