Merge pull request #475 from ShinichiU/t-3026

fix compatibility with PHP 5.2.x (fixes #3026)
openpne · Dec 4, 2020 · 0304406 · 0304406
2 parents 157450f + 20d0311
commit 0304406
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 15 deletions.
diff --git a/apps/pc_frontend/templates/_layout.php b/apps/pc_frontend/templates/_layout.php
@@ -24,9 +24,9 @@
   ), $jsonData);
 }
 
-$json = defined('JSON_PRETTY_PRINT') ? json_encode($jsonData, JSON_PRETTY_PRINT) : json_encode($jsonData);
-
-echo javascript_tag('var openpne = '.$json.';');
+echo javascript_tag('
+var openpne = '.json_encode($jsonData).';
+');
 ?>
 <?php include_javascripts() ?>
 <?php echo javascript_tag(<<<JS

diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -19,10 +19,8 @@
   'baseUrl' => $sf_request->getRelativeUrlRoot().'/',
 );
 
-$json = defined('JSON_PRETTY_PRINT') ? json_encode($jsonData, JSON_PRETTY_PRINT) : json_encode($jsonData);
-
 echo javascript_tag('
-var openpne = '.$json.';
+var openpne = '.json_encode($jsonData).';
 ');
 ?>
 <?php endif ?>

diff --git a/apps/pc_frontend/templates/smtLayoutHome.php b/apps/pc_frontend/templates/smtLayoutHome.php
@@ -19,10 +19,8 @@
   'baseUrl' => $sf_request->getRelativeUrlRoot().'/',
 );
 
-$json = defined('JSON_PRETTY_PRINT') ? json_encode($jsonData, JSON_PRETTY_PRINT) : json_encode($jsonData);
-
 echo javascript_tag('
-var openpne = '.$json.';
+var openpne = '.json_encode($jsonData).';
 ');
 ?>
 <?php endif ?>

diff --git a/apps/pc_frontend/templates/smtLayoutMember.php b/apps/pc_frontend/templates/smtLayoutMember.php
@@ -19,10 +19,8 @@
   'baseUrl' => $sf_request->getRelativeUrlRoot().'/',
 );
 
-$json = defined('JSON_PRETTY_PRINT') ? json_encode($jsonData, JSON_PRETTY_PRINT) : json_encode($jsonData);
-
 echo javascript_tag('
-var openpne = '.$json.';
+var openpne = '.json_encode($jsonData).';
 ');
 ?>
 <?php endif ?>

diff --git a/apps/pc_frontend/templates/smtLayoutSns.php b/apps/pc_frontend/templates/smtLayoutSns.php
@@ -19,10 +19,8 @@
   'baseUrl' => $sf_request->getRelativeUrlRoot().'/',
 );
 
-$json = defined('JSON_PRETTY_PRINT') ? json_encode($jsonData, JSON_PRETTY_PRINT) : json_encode($jsonData);
-
 echo javascript_tag('
-var openpne = '.$json.';
+var openpne = '.json_encode($jsonData).';
 ');
 ?>
 <?php endif ?>