From a4167e29fea97d2d24da1d4f7aa767416ff6c8b1 Mon Sep 17 00:00:00 2001 From: Christopher Pitt Date: Thu, 24 Nov 2016 08:00:34 +1300 Subject: [PATCH] Replace hard-coded directory separators constant This removes warnings when building the manifest cache in Windows environments. --- core/manifest/ManifestCache.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/manifest/ManifestCache.php b/core/manifest/ManifestCache.php index 5029bfa3c..a6b2ef339 100644 --- a/core/manifest/ManifestCache.php +++ b/core/manifest/ManifestCache.php @@ -21,22 +21,22 @@ interface ManifestCache { */ class ManifestCache_File implements ManifestCache { function __construct($name) { - $this->folder = TEMP_FOLDER.'/'.$name; + $this->folder = TEMP_FOLDER.DIRECTORY_SEPARATOR.$name; if (!is_dir($this->folder)) mkdir($this->folder); } function load($key) { - $file = $this->folder.'/cache_'.$key; + $file = $this->folder.DIRECTORY_SEPARATOR.'cache_'.$key; return file_exists($file) ? unserialize(file_get_contents($file)) : null; } function save($data, $key) { - $file = $this->folder.'/cache_'.$key; + $file = $this->folder.DIRECTORY_SEPARATOR.'cache_'.$key; file_put_contents($file, serialize($data)); } function clear() { - array_map('unlink', glob($this->folder.'/cache_*')); + array_map('unlink', glob($this->folder.DIRECTORY_SEPARATOR.'cache_*')); } } @@ -52,14 +52,14 @@ class ManifestCache_File_PHP extends ManifestCache_File { global $loaded_manifest; $loaded_manifest = null; - $file = $this->folder.'/cache_'.$key; + $file = $this->folder.DIRECTORY_SEPARATOR.'cache_'.$key; if (file_exists($file)) include $file; return $loaded_manifest; } function save($data, $key) { - $file = $this->folder.'/cache_'.$key; + $file = $this->folder.DIRECTORY_SEPARATOR.'cache_'.$key; file_put_contents($file, '