[Rt-commit] rt branch, 4.6/pjax, updated. rt-4.4.1-6-ge17b79b

[Shawn Moore]

The branch, 4.6/pjax has been updated
       via  e17b79b711e502af9f62153b50b02fdb8dbe8a2d (commit)
      from  c4f355c37f8e635bfeeba98c72606b64e2414f42 (commit)

Summary of changes:
 lib/RT/Interface/Web.pm | 3 +++
 1 file changed, 3 insertions(+)

- Log -----------------------------------------------------------------
commit e17b79b711e502af9f62153b50b02fdb8dbe8a2d
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Fri Sep 23 18:15:16 2016 +0000

    Aggressively turn off Pjax if it's disabled in config

diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index a542a48..d92ef44 100644
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -1884,6 +1884,8 @@ assets or layout should be represented here.
 =cut
 
 sub PjaxVersion {
+    return '-' if !RT->Config->Get('EnablePjax');
+
     my $style = $HTML::Mason::Commands::session{'CurrentUser'}
               ? $HTML::Mason::Commands::session{'CurrentUser'}->Stylesheet
               : RT->Config->Get('WebDefaultStylesheet');
@@ -4434,6 +4436,7 @@ sub GetCustomFieldInputNamePrefix {
 }
 
 sub IsPjaxRequest {
+    return 0 if !RT->Config->Get('EnablePjax');
     RT::Interface::Web::RequestENV('HTTP_X_PJAX');
 }
 

-----------------------------------------------------------------------