Changeset 1270

Timestamp:

12/31/2008 11:11:52 PM (4 years ago)

Author:

BrianKoontz

Message:

Added comma to list of mulipath separators. Refs #446

Location:

trunk

Files:

• libs/Wakka.class.php (modified) (2 diffs)
• wikka.php (modified) (1 diff)

trunk/libs/Wakka.class.php

@@ -4829 +4829 @@
          * Build a (possibly valid) filepath from a delimited list of paths 
          *
-         * This function takes a list of paths delimited by either ":"
-         * (Unix-style) or ";" (Window-style) and attempts to construct a
-         * fully-qualified pathname to a specific file.  By default, this
-         * function checks to see if the file pointed to by the
-         * fully-qualified pathname exists.  First valid match wins.
-         * Disabling this feature will return the first valid constructed
-         * path (i.e, a path containing a valid directory, but not
-         * necessarily pointing to an existant file).
+         * This function takes a list of paths delimited by ":"
+         * (Unix-style), ";" (Window-style), or "," (Wikka-style)  and
+         * attempts to construct a fully-qualified pathname to a specific
+         * file.  By default, this function checks to see if the file
+         * pointed to by the fully-qualified pathname exists.  First valid
+         * match wins.  Disabling this feature will return the first valid
+         * constructed path (i.e, a path containing a valid directory, but
+         * not necessarily pointing to an existant file).
          * 
          * @param string $filename mandatory: filename to be used in
@@ -4849 +4849 @@
         function BuildFullpathFromMultipath($filename, $pathlist, $checkIfFileExists=TRUE)
         {
-                $paths = preg_split('/;|:/', $pathlist);
+                $paths = preg_split('/;|:|,/', $pathlist);
                 if(empty($paths[0])) return NULL;
                 if(FALSE === $checkIfFileExists)

trunk/wikka.php

@@ -273 +273 @@
          not a concatenation.
 */
-
-if(FALSE !== strpos(strtolower(PHP_OS), strtolower('windows')))
-{
-        define('PATH_DIVIDER', ';');
-}
-else
-{
-        define('PATH_DIVIDER', ':');
-}
+define('PATH_DIVIDER', ',');
 
 /**#@+