Index: branches/5.0.x/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -r12299 -r12320
--- branches/5.0.x/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 12299)
+++ branches/5.0.x/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 12320)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: admin_tag_processor.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: admin_tag_processor.php 12320 2009-08-17 10:21:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -713,9 +713,26 @@
 			return $popup_info['PopupWidth'].'x'.$popup_info['PopupHeight'];
 		}
 
+		/**
+		 * Allows to check if popups are generally enabled OR to check for "popup" or "modal" mode is enabled
+		 *
+		 * @param Array $params
+		 * @return bool
+		 */
 		function UsePopups($params)
 		{
-			return (int)$this->Application->ConfigValue('UsePopups') || $this->Application->GetVar('_force_popup');
+			if ($this->Application->GetVar('_force_popup')) {
+				return true;
+			}
+
+			$use_popups = (int)$this->Application->ConfigValue('UsePopups');
+
+			if (array_key_exists('mode', $params)) {
+				$mode_mapping = Array ('popup' => 1, 'modal' => 2);
+				return $use_popups == $mode_mapping[ $params['mode'] ];
+			}
+
+			return $use_popups;
 		}
 
 		function UseToolbarLabels($params)