Bug 796072: Make admin/table.html.tmpl a bit faster

r=dkl a=LpSolit

diff --git a/template/en/default/admin/table.html.tmpl b/template/en/default/admin/table.html.tmpl
index 0f572d59022cb53bba38b8f7b3178b0724673460..80f6417a3a9860a2f41d5b78b9822f8c296fae9f 100644 (file)
--- a/template/en/default/admin/table.html.tmpl
+++ b/template/en/default/admin/table.html.tmpl
@@ -125,41 +125,26 @@
           [% IF class %] class="[% class FILTER html %]" [% END %]>
 
         [% IF contentlink %]
-          [% link_uri = contentlink %]
-          [% WHILE link_uri.search('%%(.+?)%%')%]
-            [% FOREACH m = link_uri.match('%%(.+?)%%') %]
-              [% IF row.$m.defined %]
-                [% replacement_value = FILTER uri; row.$m; END %]
-              [% ELSE %]
-                [% replacement_value = "" %]
-              [% END %]
-              [% link_uri = link_uri.replace("%%$m%%", replacement_value) %]
-            [% END %]
+          [% FOREACH m = contentlink.match('%%(.+?)%%', 1) %]
+            [% replacement_value = FILTER uri; row.$m; END %]
+            [% contentlink = contentlink.replace("%%$m%%", replacement_value) %]
           [% END %]
-          <a href="[% link_uri %]">
+          <a href="[% contentlink %]">
         [% END %]
-        
+
         [% IF content_use_field %]
-           [% colname = row.${c.name} %]
-           [% field_descs.${colname} FILTER html %]
+          [% colname = row.${c.name} %]
+          [% field_descs.${colname} FILTER html %]
         [% ELSIF content %]
-            [% content FILTER html_light %]
+          [% content FILTER html_light %]
+        [% ELSIF yesno_field %]
+          [% row.${c.name} ? "Yes" : "No" %]
+        [% ELSIF allow_html_content %]
+          [% row.${c.name} FILTER html_light %]
         [% ELSE %]
-          [% IF yesno_field %]
-            [% IF row.${c.name} %]
-              Yes
-            [% ELSE %]
-              No
-            [% END %]
-          [% ELSE %]
-            [% IF allow_html_content %]
-              [% row.${c.name} FILTER html_light %]
-            [% ELSE %]
-              [% row.${c.name} FILTER html %]
-            [% END %]
-          [% END %]
+          [% row.${c.name} FILTER html %]
         [% END %]
-        
+
         [% IF contentlink %]
           </a>
         [% END %]

diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index 00ae28f08598b3377fcfcc2b1ddc3fb883d2e63b..7544b6808dbd9122292b833c3e4208be7d417549 100644 (file)
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -348,7 +348,7 @@
 ],
 
 'admin/table.html.tmpl' => [
-  'link_uri'
+  'contentlink'
 ],
 
 'admin/custom_fields/cf-js.js.tmpl' => [