MDL-18672 and MDL-18679 fixed. DIRECTORY_SEPARATOR / PATH_SEPARATOR mismatch

diff --git a/search/add.php b/search/add.php
index 8871ae6bedbb5db412dc3407ff42edb52a712c52..c919aefc8dca66980a4d58fbcaf618aa2efd3102 100644 (file)
--- 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 a6883c1c57860b3e013b1f4d8e5810498b41a33a..b747e776c52305d503da00e22d69ec95811ebc16 100644 (file)
--- 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 2cbf011ae9f04d567345bb3d9d7e666072d8de4f..4b8efc08906e2cb402a519452ad780321490d90c 100644 (file)
--- 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 37ac4e632151ad4595cc067fbaf75e71acfa4fdd..8f80e69156874a2c0185573051bfd846cb0feac7 100644 (file)
--- 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 541f476796a01e71f267f0114e81686cf105c150..625d3708f26869592d5d10ec7f1839536434e7fb 100644 (file)
--- 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 2b51b9581b620bcade8a4760f57582f128486a42..0e55bab3ad664a77b4e0b3c072fe72431c09dcab 100644 (file)
--- 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');