From d8f209e84d05443406801044ece1b2470792252f Mon Sep 17 00:00:00 2001 From: diml Date: Wed, 25 Mar 2009 21:28:43 +0000 Subject: [PATCH] MDL-18672 and MDL-18679 fixed. DIRECTORY_SEPARATOR / PATH_SEPARATOR mismatch --- search/add.php | 2 +- search/delete.php | 2 +- search/indexer.php | 2 +- search/indexersplash.php | 2 +- search/tests/index.php | 2 +- search/update.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/search/add.php b/search/add.php index 8871ae6bed..c919aefc8d 100644 --- a/search/add.php +++ b/search/add.php @@ -30,7 +30,7 @@ global $DB; /// makes inclusions of the Zend Engine more reliable - ini_set('include_path', $CFG->dirroot.PATH_SEPARATOR.'search'.PATH_SEPARATOR.ini_get('include_path')); + ini_set('include_path', $CFG->dirroot.DIRECTORY_SEPARATOR.'search'.PATH_SEPARATOR.ini_get('include_path')); require_once($CFG->dirroot.'/search/lib.php'); require_once($CFG->dirroot.'/search/indexlib.php'); diff --git a/search/delete.php b/search/delete.php index a6883c1c57..b747e776c5 100644 --- a/search/delete.php +++ b/search/delete.php @@ -28,7 +28,7 @@ global $DB; /// makes inclusions of the Zend Engine more reliable - ini_set('include_path', $CFG->dirroot.PATH_SEPARATOR.'search'.PATH_SEPARATOR.ini_get('include_path')); + ini_set('include_path', $CFG->dirroot.DIRECTORY_SEPARATOR.'search'.PATH_SEPARATOR.ini_get('include_path')); require_once($CFG->dirroot.'/search/lib.php'); require_once($CFG->dirroot.'/search/indexlib.php'); diff --git a/search/indexer.php b/search/indexer.php index 2cbf011ae9..4b8efc0890 100644 --- a/search/indexer.php +++ b/search/indexer.php @@ -37,7 +37,7 @@ require_once('../config.php'); require_once($CFG->dirroot.'/search/lib.php'); - ini_set('include_path', $CFG->dirroot.PATH_SEPARATOR.'search'.PATH_SEPARATOR.ini_get('include_path')); + ini_set('include_path', $CFG->dirroot.DIRECTORY_SEPARATOR.'search'.PATH_SEPARATOR.ini_get('include_path')); /// only administrators can index the moodle installation, because access to all pages is required diff --git a/search/indexersplash.php b/search/indexersplash.php index 37ac4e6321..8f80e69156 100644 --- a/search/indexersplash.php +++ b/search/indexersplash.php @@ -21,7 +21,7 @@ require_once('../config.php'); /// makes inclusions of the Zend Engine more reliable - ini_set('include_path', $CFG->dirroot.PATH_SEPARATOR.'search'.PATH_SEPARATOR.ini_get('include_path')); + ini_set('include_path', $CFG->dirroot.DIRECTORY_SEPARATOR.'search'.PATH_SEPARATOR.ini_get('include_path')); require_once($CFG->dirroot.'/search/lib.php'); diff --git a/search/tests/index.php b/search/tests/index.php index 541f476796..625d3708f2 100644 --- a/search/tests/index.php +++ b/search/tests/index.php @@ -24,7 +24,7 @@ require_once('../../config.php'); /// makes inclusions of the Zend Engine more reliable - ini_set('include_path', $CFG->dirroot.PATH_SEPARATOR.'search'.PATH_SEPARATOR.ini_get('include_path')); + ini_set('include_path', $CFG->dirroot.DIRECTORY_SEPARATOR.'search'.PATH_SEPARATOR.ini_get('include_path')); require_once($CFG->dirroot.'/search/lib.php'); diff --git a/search/update.php b/search/update.php index 2b51b9581b..0e55bab3ad 100644 --- a/search/update.php +++ b/search/update.php @@ -28,7 +28,7 @@ global $DB; /// makes inclusions of the Zend Engine more reliable - ini_set('include_path', $CFG->dirroot.PATH_SEPARATOR.'search'.PATH_SEPARATOR.ini_get('include_path')); + ini_set('include_path', $CFG->dirroot.DIRECTORY_SEPARATOR.'search'.PATH_SEPARATOR.ini_get('include_path')); require_once($CFG->dirroot.'/search/lib.php'); require_once($CFG->dirroot.'/search/indexlib.php'); -- 2.39.5