Merge remote-tracking branch 'origin/maven/fixes/7.0' into maven/fixe…

…s/8.0
edu-sharing · Dec 12, 2022 · 6b847a5 · 6b847a5
2 parents b9b85f8 + a816bd6
commit 6b847a5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/main/php/admin/update/update.php b/src/main/php/admin/update/update.php
@@ -484,16 +484,11 @@ function run($installedVersion) {
         }
 
         if(version_compare ( '6.0.101', $installedVersion ) > 0) {
-            file_put_contents(MC_ROOT_PATH . 'conf/system.conf.php', 'DEFINE("ENABLE_VIEWER_JS", true); # toggle viewer.js for office documents', FILE_APPEND | LOCK_EX);
+            file_put_contents(MC_ROOT_PATH . 'conf/system.conf.php', 'DEFINE("ENABLE_VIEWER_JS", true); # toggle viewer.js for office documents' . PHP_EOL, FILE_APPEND | LOCK_EX);
         }
 
         if(version_compare ( '6.0.102', $installedVersion ) > 0) {
-            $viewer_js_conf = "VIEWER_JS_CONFIG = [
-                'pdf',
-                //'office',
-                //'spreadsheet'
-            ];";
-            file_put_contents(MC_ROOT_PATH . 'conf/system.conf.php', $viewer_js_conf, FILE_APPEND | LOCK_EX);
+            file_put_contents(MC_ROOT_PATH . 'conf/system.conf.php', '$VIEWER_JS_CONFIG = ["pdf"]; # office and spreadsheet also available' . PHP_EOL, FILE_APPEND | LOCK_EX);
         }
 
 

diff --git a/src/main/php/install/_tmpl/conf/system.conf.php b/src/main/php/install/_tmpl/conf/system.conf.php
@@ -14,6 +14,7 @@
 $DATAPROTECTIONREGULATION_CONFIG = ["enabled" => false, "modules" => [], "urls" => ['/.*/' => ["name" => "Example", "url" => "http://example"]]];
 
 DEFINE("ENABLE_VIEWER_JS", true); # toggle viewer.js for office documents
+$VIEWER_JS_CONFIG = ["pdf"]; # office and spreadsheet also available
 
 $ESRENDER_SESSION_NAME = 'ESSID';