From 0decebd55b2e5ba98b64dd7dfc8a557702388bd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cornelius=20Wei=C3=9F?= <nelius_weiss@alumni.egroupware.org>
Date: Thu, 18 May 2006 16:14:35 +0000
Subject: [PATCH] merge from 1.2

---
 resources/inc/class.ui_resources.inc.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/inc/class.ui_resources.inc.php b/resources/inc/class.ui_resources.inc.php
index aad4a30437..1fcfc7ba6c 100755
--- a/resources/inc/class.ui_resources.inc.php
+++ b/resources/inc/class.ui_resources.inc.php
@@ -361,6 +361,12 @@ class ui_resources
 	 */
 	function select($content='')
 	{
+		if (!is_object($GLOBALS['phpgw']->js))
+		{
+			$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
+		}
+		$GLOBALS['phpgw']->js->set_onload("copyOptions('exec[resources][selectbox]');");
+		
 		$GLOBALS['egw_info']['flags']['java_script'] .= "<script LANGUAGE=\"JavaScript\">
 			window.focus();
 			
@@ -461,12 +467,6 @@ class ui_resources
 			*/
 				window.close();
 			}</script>";
-
-		if (!is_object($GLOBALS['phpgw']->js))
-		{
-			$GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript');
-		}
-		$GLOBALS['phpgw']->js->set_onload("copyOptions('exec[resources][selectbox]');");
 		
 		$content['nm']['header_left'] = 'resources.resource_select.header';
 		$content['nm']['show_bookable'] = true;