* Fix bug #16707.
This commit is contained in:
@@ -60,7 +60,7 @@ class program extends control
|
||||
$this->view->orderBy = $orderBy;
|
||||
$this->view->users = $this->user->getPairs('noletter');
|
||||
$this->view->userIdPairs = $this->user->getPairs('noletter|showid');
|
||||
$this->view->usersAvatar = $this->user->getAvatarPairs(false);
|
||||
$this->view->usersAvatar = $this->user->getAvatarPairs('');
|
||||
$this->view->programType = $programType;
|
||||
$this->view->PMList = $PMList;
|
||||
$this->view->progressList = $this->program->getProgressList();
|
||||
|
||||
@@ -37,11 +37,11 @@ class userModel extends model
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function getList($undeleted = true)
|
||||
public function getList($params = 'nodeleted')
|
||||
{
|
||||
return $this->dao->select('*')->from(TABLE_USER)
|
||||
->where('type')->eq('inside')
|
||||
->beginIF($undeleted == true)->andWhere('deleted')->eq(0)->fi()
|
||||
->beginIF(strpos($params, 'nodeleted') !== false)->andWhere('deleted')->eq(0)->fi()
|
||||
->orderBy('account')
|
||||
->fetchAll();
|
||||
}
|
||||
@@ -146,10 +146,10 @@ class userModel extends model
|
||||
* @access public
|
||||
* @return array
|
||||
*/
|
||||
public function getAvatarPairs($undeleted = true)
|
||||
public function getAvatarPairs($params = 'nodeleted')
|
||||
{
|
||||
$avatarPairs = array();
|
||||
$userList = $this->getList($undeleted);
|
||||
$userList = $this->getList($params);
|
||||
foreach($userList as $user) $avatarPairs[$user->account] = $user->avatar;
|
||||
|
||||
return $avatarPairs;
|
||||
|
||||
Reference in New Issue
Block a user