From 013dc429aa727dfd3c4a7d9c1ffe4f279e502c50 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Fri, 9 Jan 2009 23:54:09 +0100 Subject: [PATCH] Temporary fixes issues due to conflict between the existance of a promo field in both auth_user_md5 and profile_display, will have to removed once auth_user_md5 is trashed. --- include/userset.inc.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/userset.inc.php b/include/userset.inc.php index d90dc3a..9d31ff4 100644 --- a/include/userset.inc.php +++ b/include/userset.inc.php @@ -161,11 +161,11 @@ class MinificheView extends MultipageView global $globals; $this->entriesPerPage = $globals->search->per_page; if (@$params['with_score']) { - $this->addSortKey('score', array('-score', '-date', '-promo', 'sort_name'), 'pertinence'); + $this->addSortKey('score', array('-score', '-date', '-d.promo', 'sort_name'), 'pertinence'); } $this->addSortKey('name', array('sort_name'), 'nom'); - $this->addSortKey('promo', array('-promo', 'sort_name'), 'promotion'); - $this->addSortKey('date_mod', array('-date', '-promo', 'sort_name'), 'dernière modification'); + $this->addSortKey('promo', array('-d.promo', 'sort_name'), 'promotion'); + $this->addSortKey('date_mod', array('-date', '-d.promo', 'sort_name'), 'dernière modification'); parent::__construct($set, $data, $params); } @@ -267,8 +267,8 @@ class MentorView extends MultipageView $this->entriesPerPage = 10; $this->addSortKey('rand', array('RAND(' . S::i('uid') . ')'), 'aléatoirement'); $this->addSortKey('name', array('sort_name'), 'nom'); - $this->addSortKey('promo', array('-promo', 'sort_name'), 'promotion'); - $this->addSortKey('date_mod', array('-date', '-promo', 'sort_name'), 'dernière modification'); + $this->addSortKey('promo', array('-d.promo', 'sort_name'), 'promotion'); + $this->addSortKey('date_mod', array('-date', '-d.promo', 'sort_name'), 'dernière modification'); parent::__construct($set, $data, $params); } @@ -314,10 +314,10 @@ class TrombiView extends MultipageView $this->entriesPerPage = 24; $this->order = explode(',', Env::v('order', 'sort_name')); if (@$params['with_score']) { - $this->addSortKey('score', array('-score', '-watch_last', '-promo', 'sort_name'), 'pertinence'); + $this->addSortKey('score', array('-score', '-watch_last', '-d.promo', 'sort_name'), 'pertinence'); } $this->addSortKey('name', array('sort_name'), 'nom'); - $this->addSortKey('promo', array('-promo', 'sort_name'), 'promotion'); + $this->addSortKey('promo', array('-d.promo', 'sort_name'), 'promotion'); parent::__construct($set, $data, $params); } -- 2.1.4