summaryrefslogtreecommitdiffstats
path: root/modules-available
diff options
context:
space:
mode:
authorSimon Rettberg2019-11-06 15:44:45 +0100
committerSimon Rettberg2019-11-06 15:44:45 +0100
commitb5b3f9ba5dbabc862dcfe517689cace86367a690 (patch)
treec2d5dd2d8c81d7ae661f51e13fa2b29a8fc68377 /modules-available
parent[locations] Show number of machines with configvar overrides (diff)
downloadslx-admin-b5b3f9ba5dbabc862dcfe517689cace86367a690.tar.gz
slx-admin-b5b3f9ba5dbabc862dcfe517689cace86367a690.tar.xz
slx-admin-b5b3f9ba5dbabc862dcfe517689cace86367a690.zip
[translation] Get rid of up_json_encode
This was needed in pre-5.4.0 times. Long gone.
Diffstat (limited to 'modules-available')
-rw-r--r--modules-available/translation/page.inc.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/modules-available/translation/page.inc.php b/modules-available/translation/page.inc.php
index 7d5229d7..34389b75 100644
--- a/modules-available/translation/page.inc.php
+++ b/modules-available/translation/page.inc.php
@@ -1031,10 +1031,8 @@ class Page_Translation extends Page
unlink($file);
}
} else {
- // JSON_PRETTY_PRINT is only available starting with php 5.4.0.... Use upgradephp's json_encode
- require_once('inc/up_json_encode.php');
ksort($data); // Sort by key, so the diff on the output is cleaner
- $json = up_json_encode($data, JSON_PRETTY_PRINT); // Also for better diffability of the json files, we pretty print
+ $json = json_encode($data, JSON_PRETTY_PRINT); // Also for better diffability of the json files, we pretty print
//exits the function in case the action was unsuccessful
if (file_put_contents($file, $json) === false) {
Message::addError('main.error-write', $file);