[Fmsystem-commits] [8666] keep domain

[Sigurd Nes]

Revision: 8666
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8666
Author:   sigurdne
Date:     2012-01-24 13:03:07 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------
keep domain

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.asyncservice.inc.php

Modified: trunk/phpgwapi/inc/class.asyncservice.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.asyncservice.inc.php       2012-01-24 12:27:53 UTC 
(rev 8665)
+++ trunk/phpgwapi/inc/class.asyncservice.inc.php       2012-01-24 13:03:07 UTC 
(rev 8666)
@@ -403,9 +403,6 @@
                                                $lang   = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'];
                                                
unset($GLOBALS['phpgw_info']['user']);
 
-                                               
$GLOBALS['phpgw_info']['user']['domain'] = $domain;
-                                               
$GLOBALS['phpgw_info']['server']['default_domain'] = $domain;
-
                                                if ($job['account_id'])
                                                {
                                                        
$GLOBALS['phpgw']->session->set_account_id($job['account_id']);
@@ -418,6 +415,8 @@
                                                                
$GLOBALS['phpgw']->translation->add_app('common');
                                                        }
                                                }
+                                               
$GLOBALS['phpgw_info']['user']['domain'] = $domain;
+                                               
$GLOBALS['phpgw_info']['server']['default_domain'] = $domain;
                                        }
                                        list($app) = 
explode('.',$job['method']);
                                        
$GLOBALS['phpgw']->translation->add_app($app);