From 58af642580842954333c28da76d499e04243a1d2 Mon Sep 17 00:00:00 2001 From: "Pierre Habouzit (MadCoder" Date: Tue, 28 Dec 2004 07:48:48 +0000 Subject: [PATCH] backport Patches applied: * opensource@polytechnique.org--2005/platal--release--0.9.3--base-0 tag of opensource@polytechnique.org--2005/platal--mainline--0.9--patch-150 * opensource@polytechnique.org--2005/platal--release--0.9.3--patch-1 fix advanced search bug (XdX on support) * opensource@polytechnique.org--2005/platal--release--0.9.3--patch-2 fix commit script * opensource@polytechnique.org--2005/platal--release--0.9.3--patch-3 really ... fix commit script ... damnit git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-151 --- ChangeLog | 10 ++++++++++ htdocs/advanced_search.php | 2 +- htdocs/css/openweb.css | 3 +-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3df55dc..96e06ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,14 @@ ================================================================================ +VERSION 0.9.4 29 Jan 2004 + +New : + + * Skins : + - Openweb : update. -MC + +Bug/Wish : + +================================================================================ VERSION 0.9.3 27 Dec 2004 New : diff --git a/htdocs/advanced_search.php b/htdocs/advanced_search.php index a590d1d..f0b5ae3 100644 --- a/htdocs/advanced_search.php +++ b/htdocs/advanced_search.php @@ -118,7 +118,7 @@ if (!Env::has('rechercher')) { w.ni_id AS watch FROM auth_user_md5 AS u '.$fields->get_select_statement().' - '.(Env::has('only_referent') ? '' : ' INNER JOIN mentor AS m ON (m.uid = u.user_id)').' + '.(Env::has('only_referent') ? ' INNER JOIN mentor AS m ON (m.uid = u.user_id)' : '').' LEFT JOIN aliases AS a ON (u.user_id = a.id AND a.type="a_vie") LEFT JOIN contacts AS c ON (c.uid='.Session::getInt('uid').' AND c.contact=u.user_id) LEFT JOIN watch_nonins AS w ON (w.ni_id=u.user_id AND w.uid='.Session::getInt('uid').') diff --git a/htdocs/css/openweb.css b/htdocs/css/openweb.css index fe9fbe2..a0e262a 100644 --- a/htdocs/css/openweb.css +++ b/htdocs/css/openweb.css @@ -478,8 +478,7 @@ table#body { border: 3px solid #000; width: 900px; - margin-left: auto; - margin-right: auto; + margin: 1em auto; } #body-logo { -- 2.1.4