summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alex@spline.inf.fu-berlin.de>2015-09-28 00:41:01 +0200
committerwww-data <www-data@vm-doku.spline.inf.fu-berlin.de>2015-09-28 00:41:35 +0200
commit4480a7e61e591bd7098e51cabbe38aa4f8cd72e8 (patch)
tree0fbfcb7b3a0a7e6796f03658be677a912bf2dbd7
parent96f4d7a855a751b14a36bb0c0e78c88db033d169 (diff)
downloaddokuwiki-4480a7e61e591bd7098e51cabbe38aa4f8cd72e8.tar.gz
dokuwiki-4480a7e61e591bd7098e51cabbe38aa4f8cd72e8.tar.bz2
dokuwiki-4480a7e61e591bd7098e51cabbe38aa4f8cd72e8.zip
Update to new symfony-yaml version
-rwxr-xr-xupdate.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/update.php b/update.php
index 1b77f4e..c9082af 100755
--- a/update.php
+++ b/update.php
@@ -10,8 +10,12 @@ ini_set('memory_limit','128M');
if(!defined('DOKU_INC')) define('DOKU_INC', '/usr/share/dokuwiki/');
require_once(DOKU_INC.'inc/init.php');
require_once(DOKU_INC.'inc/cliopts.php');
-require_once('SymfonyComponents/YAML/sfYaml.php');
require_once('smarty3/Smarty.class.php');
+require_once('Symfony/Component/Yaml/Yaml.php');
+require_once('Symfony/Component/Yaml/Parser.php');
+require_once('Symfony/Component/Yaml/Inline.php');
+require_once('Symfony/Component/Yaml/Unescaper.php');
+
session_write_close();
#------------------------------------------------------------------------------
@@ -136,9 +140,9 @@ function _load_hostinfo_data($path) {
die("Invalid hostinfo path: $path\n");
}
- $hosts = sfYaml::load($hosts_file);
+ $hosts = Symfony\Component\Yaml\Yaml::parse($hosts_file);
foreach ($hosts['hosts'] as $host) {
- $HOSTINFO[$host] = sfYaml::load($path . '/' . $host);
+ $HOSTINFO[$host] = Symfony\Component\Yaml\Yaml::parse($path . '/' . $host);
}
}