From: <sy...@us...> - 2008-10-14 19:35:24
|
Revision: 15145 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=15145&view=rev Author: sylvieg Date: 2008-10-14 19:35:08 +0000 (Tue, 14 Oct 2008) Log Message: ----------- [FIX]users: an api function must be set with default params to the current or less ressource demanding: include_prefs=true can be very ressource consuming and is generally not used (tiki-upload_file was running out of ressource) Modified Paths: -------------- trunk/lib/tikilib.php trunk/tiki-list_users.php trunk/tiki-upload_file.php Modified: trunk/lib/tikilib.php =================================================================== --- trunk/lib/tikilib.php 2008-10-14 17:42:18 UTC (rev 15144) +++ trunk/lib/tikilib.php 2008-10-14 19:35:08 UTC (rev 15145) @@ -2493,7 +2493,7 @@ } } - function list_users($offset = 0, $maxRecords = -1, $sort_mode = 'pref:realName', $find = '', $include_prefs = true) { + function list_users($offset = 0, $maxRecords = -1, $sort_mode = 'pref:realName', $find = '', $include_prefs = false) { global $user, $prefs, $userprefslib; include_once('lib/userprefs/userprefslib.php'); Modified: trunk/tiki-list_users.php =================================================================== --- trunk/tiki-list_users.php 2008-10-14 17:42:18 UTC (rev 15144) +++ trunk/tiki-list_users.php 2008-10-14 19:35:08 UTC (rev 15145) @@ -50,7 +50,7 @@ } $smarty->assign('find',$find); -$listusers = $tikilib->list_users($offset,$maxRecords,$sort_mode,$find); +$listusers = $tikilib->list_users($offset,$maxRecords,$sort_mode,$find, true); // If there're more records then assign next_offset $cant_pages = ceil($listusers["cant"] / $maxRecords); Modified: trunk/tiki-upload_file.php =================================================================== --- trunk/tiki-upload_file.php 2008-10-14 17:42:18 UTC (rev 15144) +++ trunk/tiki-upload_file.php 2008-10-14 19:35:08 UTC (rev 15145) @@ -413,7 +413,7 @@ } if ($tiki_p_admin_file_galleries == 'y' || $tiki_p_admin == 'y') { - $users = $tikilib->list_users(0, -1, 'login_asc'); + $users = $tikilib->list_users(0, -1, 'login_asc', '', false); $smarty->assign_by_ref('users', $users['data']); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |