From: Frédéric Buclin <LpSolit@gmail.com>
Date: Mon, 24 Nov 2014 09:32:18 +0000 (+0100)
Subject: Bug 1102003: The URL and status whiteboard fields display ARRAY(...) instead of real... 
X-Git-Tag: release-5.1.1~449
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0eb69045b7a52fb4f8616be3ce16a98a83d35831;p=thirdparty%2Fbugzilla.git

Bug 1102003: The URL and status whiteboard fields display ARRAY(...) instead of real data
r=dkl a=glob
---

diff --git a/t/008filter.t b/t/008filter.t
index 204bbdc43d..fea018d439 100644
--- a/t/008filter.t
+++ b/t/008filter.t
@@ -212,7 +212,7 @@ sub directive_ok {
     return 1 if $directive =~ /FILTER\ (html|csv|js|base64|css_class_quote|ics|
                                         quoteUrls|time|uri|xml|lower|html_light|
                                         obsolete|inactive|closed|unitconvert|
-                                        txt|html_linebreak|markdown|none)\b/x;
+                                        txt|html_linebreak|markdown|none|null)\b/x;
 
     return 0;
 }
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index a7674faf85..516a24ed8e 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -205,7 +205,7 @@
         accesskey = "s"
         tag_name = 'span'
       %]
-      [% PROCESS input inputname => "short_desc" size => "80"
+      [% INCLUDE input inputname => "short_desc" size => "80"
                        maxlength => 255 spellcheck => "true" no_td => 1 %]
     </div>
   </div>
@@ -500,7 +500,7 @@
         (<a href="#" id="bz_url_edit_action">edit</a>)</span>
       [% END %]
       <span id="bz_url_input_area">
-        [% url_output =  PROCESS input no_td=1 inputname => "bug_file_loc" size => "40" colspan => 2 %]
+        [% url_output =  INCLUDE input no_td=1 inputname => "bug_file_loc" size => "40" colspan => 2 %]
         [% IF NOT bug.check_can_change_field("bug_file_loc", 0, 1)
               AND is_safe_url(bug.bug_file_loc) %]
           <a href="[% bug.bug_file_loc FILTER html %]">[% url_output FILTER none %]</a>
@@ -527,7 +527,7 @@
         editable = 1
         accesskey = "w"
       %]
-      [% PROCESS input inputname => "status_whiteboard" size => "40" colspan => 2 %]
+      [% INCLUDE input inputname => "status_whiteboard" size => "40" colspan => 2 %]
     </tr>
   [% END %]
   
@@ -1214,7 +1214,7 @@
   [% IF no_td != 1 %]
   <td[% " colspan=\"$colspan\"" IF colspan %]>
   [% END %]
-    [% val = value ? value : bug.$inputname %]
+    [% val = bug.$inputname %]
     [% IF bug.check_can_change_field(inputname, 0, 1) %]
        <input id="[% inputname %]" name="[% inputname %]" class="text_input"
               value="[% val FILTER html %]"[% " size=\"$size\"" IF size %]
@@ -1232,13 +1232,8 @@
   [% IF no_td != 1 %]  
   </td>
   [% END %]
-  [% no_td = 0 %]
-  [% maxlength = 0 %]
-  [% colspan = 0 %]
-  [% size = 0 %]
-  [% value = undef %]
-  [% spellcheck = undef %]
 [% END %]
+
 [% BLOCK commit_button %]
   [% IF user.id %]
     <div class="knob-buttons">
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index dd1923f29f..5c731c008a 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -82,7 +82,7 @@
   "js/jquery/ui/jquery-ui-structure-min.css",
   "js/jquery/ui/jquery-ui-theme-min.css",
 ] %]
-[% undef = style_urls.import(jquery_css, jq_css_urls) %]
+[% style_urls.import(jquery_css, jq_css_urls) FILTER null %]
 
 [%# Add jQuery cookie support %]
 [% jquery.push("cookie") %]