Merge commit 'v7.10.20' into WebGUI8

2011-10-26 15:02:51 -07:00 · 2011-10-26 15:02:51 -07:00 · fdb979ca8a
commit fdb979ca8a
parent 4fea10a1f5 7fda01b291
72 changed files with 830 additions and 224 deletions
--- a/t/Asset/Wobject/EventManagementSystem.t
+++ b/t/Asset/Wobject/EventManagementSystem.t
@ -334,6 +334,7 @@ is($printRemainingTicketsTemplateId, "hreA_bgxiTX-EzWCSZCZJw", 'Default print re
            'uiLevel'                           => ignore(),
            'tickets_loop'                      => \@ticketArray,
            controls                            => ignore(),
+            keywords                            => ignore(),
         },
        "www_printRemainingTickets: template variables valid"
    );