Merge remote-tracking branch 'remotes/origin/develop' into feature/goback-in-viewerfeature/goback-in-viewer

1 files changed, 4 insertions, 0 deletions

diff --git a/controller/settingscontroller.php b/controller/settingscontroller.php
index 6f82553..adc6fe8 100644
--- a/controller/settingscontroller.php
+++ b/controller/settingscontroller.php
@@ -126,6 +126,7 @@ class SettingsController extends Controller {
             "toolbarNoTabs" => $this->config->GetCustomizationToolbarNoTabs(),
             "successful" => $this->config->SettingsAreSuccessful(),
             "watermark" => $this->config->GetWatermarkSettings(),
+            "macros" => $this->config->GetCustomizationMacros(),
             "tagsEnabled" => App::isEnabled("systemtags"),
             "reviewDisplay" => $this->config->GetCustomizationReviewDisplay(),
             "templates" => $this->GetGlobalTemplates()
@@ -200,6 +201,7 @@ class SettingsController extends Controller {
      * @param bool $forcesave - forcesave
      * @param bool $help - display help
      * @param bool $toolbarNoTabs - display toolbar tab
+     * @param bool $macros - run document macros
      * @param string $reviewDisplay - review viewing mode
      *
      * @return array
@@ -216,6 +218,7 @@ class SettingsController extends Controller {
                                     $forcesave,
                                     $help,
                                     $toolbarNoTabs,
+                                    $macros,
                                     $reviewDisplay
                                     ) {
 
@@ -231,6 +234,7 @@ class SettingsController extends Controller {
         $this->config->SetCustomizationForcesave($forcesave);
         $this->config->SetCustomizationHelp($help);
         $this->config->SetCustomizationToolbarNoTabs($toolbarNoTabs);
+        $this->config->SetCustomizationMacros($macros);
         $this->config->SetCustomizationReviewDisplay($reviewDisplay);
 
         return [