Merge branch '4.2-trunk' into 4.4.3-releng

bestpractical · Jun 21, 2018 · fb82702 · fb82702
2 parents bf05ee7 + 97416a3
commit fb82702
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/RT/Plugin.pm b/lib/RT/Plugin.pm
@@ -92,7 +92,8 @@ Returns the extension version.
 
 sub Version {
     my $self = shift;
-    return $self->Name->VERSION;
+    no strict 'refs';
+    return ${$self->Name . '::VERSION'};
 }
 
 =head2 Path

diff --git a/share/html/Admin/Scrips/index.html b/share/html/Admin/Scrips/index.html
@@ -66,7 +66,10 @@ <h1><%$caption%></h1>
     AllowSorting  => 1,
     PassArguments => [qw(
        FindDisabledScrips
-    )], 
+       Page
+       Order
+       OrderBy
+    )],
 &>
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,7 +66,10 @@ <h1><%$caption%></h1> @@
         AllowSorting  => 1,
         PassArguments => [qw(
            FindDisabledScrips
-        )],
+           Page
+           Order
+           OrderBy
+        )],
     &>
@@ Expand Down @@