Backport

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1453 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/modules/core.php b/modules/core.php
index 1680b47..2ac92ce 100644 (file)
--- a/modules/core.php
+++ b/modules/core.php
@@ -115,8 +115,8 @@ class CoreModule extends PLModule
                   . "----------------------------\n"
                   . "Page        : " . Env::v('page') . "\n\n"
                   . "Utilisateur : " . S::v('forlife') . "\n"
-                  . "Navigateur  : " . Env::v('browser') . "\n"
-                  . "Skin        : " . Env::v('skin') . "\n";
+                  . "Navigateur  : " . $_SERVER['HTTP_USER_AGENT'] . "\n"
+                  . "Skin        : " . S::v('skin') . "\n";
             $page->assign('bug_sent',1);
             $mymail = new PlMailer();
             $mymail->setFrom('"'.S::v('prenom').' '.S::v('nom').'" <'.S::v('bestalias').'@polytechnique.org>');

diff --git a/templates/core/bug.tpl b/templates/core/bug.tpl
index e3059f6..bbfdfc3 100644 (file)
--- a/templates/core/bug.tpl
+++ b/templates/core/bug.tpl
@@ -62,9 +62,7 @@ function fillContent()
     </select>\r
     &nbsp;&nbsp;Sujet : <input type="text" name="item_summary" id="flyspray_title" value="sur la page {$smarty.server.HTTP_REFERER}" size="50" maxlength="100"/>\r
     <textarea name="detailed_desc" id="flyspray_detail" cols="70" rows="10" style="width:100%;margin-top:10px;margin-bottom:10px;height:400px;display:block;" onFocus="cleanContent()" onBlur="fillContent()"></textarea>\r
-    <input type="hidden" name="page" value="{$smarty.server.HTTP_REFERER}" />\r
-    <input type="hidden" name="browser" value="{$smarty.server.HTTP_USER_AGENT}" />\r
-    <input type="hidden" name="skin" value="{$smarty.session.skin}" />\r
+    <input type="hidden" name="page" value="{$smarty.server.HTTP_REFERER|default:$smarty.request.page}" />\r
     <div class="center">\r
       <input type="button" value="Fermer" onclick="window.close()"/>\r
       <input type="submit" name="send" value="Signaler le bug"/>\r