aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMate Bartus <mate.bartus@gmail.com>2015-07-25 14:42:37 +0200
committerMate Bartus <mate.bartus@gmail.com>2015-07-25 14:42:37 +0200
commit723337d2f68940eff64586cc91151fad2c40ea6e (patch)
treedc135513351d7660c0f2f81a1a7ffda07ed7878f
parent04186e8498c78d16f8eb5402c19d70e9e7795e83 (diff)
downloadforums-723337d2f68940eff64586cc91151fad2c40ea6e.tar
forums-723337d2f68940eff64586cc91151fad2c40ea6e.tar.gz
forums-723337d2f68940eff64586cc91151fad2c40ea6e.tar.bz2
forums-723337d2f68940eff64586cc91151fad2c40ea6e.tar.xz
forums-723337d2f68940eff64586cc91151fad2c40ea6e.zip
[ticket/13740] Use JSON for installer config
PHPBB3-13740
-rw-r--r--phpBB/phpbb/install/helper/config.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/install/helper/config.php b/phpBB/phpbb/install/helper/config.php
index 38376da82a..b0480e7e5b 100644
--- a/phpBB/phpbb/install/helper/config.php
+++ b/phpBB/phpbb/install/helper/config.php
@@ -231,7 +231,7 @@ class config
if (!empty($serialized_data))
{
- $unserialized_data = unserialize($serialized_data);
+ $unserialized_data = json_decode($serialized_data, true);
$this->installer_config = (is_array($unserialized_data['installer_config'])) ? $unserialized_data['installer_config'] : array();
$this->progress_data = (is_array($unserialized_data['progress_data'])) ? $unserialized_data['progress_data'] : array();
@@ -259,7 +259,7 @@ class config
// Create file content
$file_content = '<?php // ';
- $file_content .= serialize($save_array);
+ $file_content .= json_encode($save_array);
$file_content .= "\n";
// Dump file_content to disk