[Fmsystem-commits] [6744] Merge 6742:6743 from trunk

[Sigurd Nes]

Revision: 6744
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6744
Author:   sigurdne
Date:     2011-01-10 14:36:50 +0000 (Mon, 10 Jan 2011)
Log Message:
-----------
Merge 6742:6743 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/admin/inc/class.uiaccounts.inc.php

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743

Modified: branches/Version-1_0-branch/admin/inc/class.uiaccounts.inc.php
===================================================================
--- branches/Version-1_0-branch/admin/inc/class.uiaccounts.inc.php      
2011-01-10 14:28:34 UTC (rev 6743)
+++ branches/Version-1_0-branch/admin/inc/class.uiaccounts.inc.php      
2011-01-10 14:36:50 UTC (rev 6744)
@@ -333,7 +333,7 @@
 
                                $valid_users = array_unique($valid_users);
 
-                               $allusers = 
$GLOBALS['phpgw']->accounts->get_list('accounts', -1,$this->sort, $this->order, 
$this->query);
+                               $allusers = 
$GLOBALS['phpgw']->accounts->get_list('accounts', -1,$sort, $order, $query);
                                foreach($allusers as  $user)
                                {
                                        if(!in_array($user->id, $valid_users))
@@ -346,7 +346,7 @@
                                $total = count($allusers);
                                $length = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
 
-                               if ($this->allrows)
+                               if ($allrows)
                                {
                                        $start = 0;
                                        $length = $total;
@@ -521,6 +521,9 @@
                                                                                
array('menuaction' => 'admin.uimainscreen.mainscreen'))
                        );
 
+                       $link_data['sort']      = $sort;
+                       $link_data['order']     = $order;
+
                        $nm = array
                        (
                                'start'                         => $start == -1 
? 0 : $start,