[Fmsystem-commits] [8734]

[Erik Holm-Larsen]

Revision: 8734
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8734
Author:   erikhl
Date:     2012-01-31 09:14:39 +0000 (Tue, 31 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/hook_home.inc.php

Modified: trunk/controller/inc/hook_home.inc.php
===================================================================
--- trunk/controller/inc/hook_home.inc.php      2012-01-31 08:13:46 UTC (rev 
8733)
+++ trunk/controller/inc/hook_home.inc.php      2012-01-31 09:14:39 UTC (rev 
8734)
@@ -39,8 +39,8 @@
        
        $config = CreateObject('phpgwapi.config','controller');
        $config->read();
-       $limit_no_of_planned = 
isset($config->config_data['no_of_planned_controls']) && 
$config->config_data['no_of_planned_controls'] > 0 ? 
$config->config_data['no_of_planned_controls']:5;
-       $limit_no_of_assigned = 
isset($config->config_data['no_of_assigned_controls']) && 
$config->config_data['no_of_assigned_controls'] > 0 ? 
$config->config_data['no_of_assigned_controls']:10;
+       $limit_no_of_planned = 
isset($GLOBALS['phpgw_info']['user']['preferences']['controller']['no_of_planned_controls'])?
 
$GLOBALS['phpgw_info']['user']['preferences']['controller']['no_of_planned_controls']
 : (isset($config->config_data['no_of_planned_controls']) && 
$config->config_data['no_of_planned_controls'] > 0 ? 
$config->config_data['no_of_planned_controls']:5);
+       $limit_no_of_assigned = 
isset($GLOBALS['phpgw_info']['user']['preferences']['controller']['no_of_assigned_controls'])?
 
$GLOBALS['phpgw_info']['user']['preferences']['controller']['no_of_assigned_controls']
 : (isset($config->config_data['no_of_assigned_controls']) && 
$config->config_data['no_of_assigned_controls'] > 0 ? 
$config->config_data['no_of_assigned_controls']:10);
 
        //echo '<H1> Hook for controller </H1>';        
        //$location_code = '1101';