[phpwiki-checkins] SF.net SVN: phpwiki:[10568] trunk/lib/FileFinder.php

[<var...@us...>]

Revision: 10568
          http://sourceforge.net/p/phpwiki/code/10568
Author:   vargenau
Date:     2021-09-17 14:23:54 +0000 (Fri, 17 Sep 2021)
Log Message:
-----------
Replace forcePathSlashes by slashifyPath

Modified Paths:
--------------
    trunk/lib/FileFinder.php

Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php	2021-09-17 14:16:43 UTC (rev 10567)
+++ trunk/lib/FileFinder.php	2021-09-17 14:23:54 UTC (rev 10568)
@@ -68,7 +68,7 @@
     }
 
     /**
-     * Unify used pathsep character.
+     * Force using '/' as path separator.
      * Accepts array of paths also.
      *
      * @param string|array $path
@@ -76,21 +76,10 @@
      */
     public function slashifyPath($path)
     {
-        return $this->forcePathSlashes($path);
-    }
-
-    /**
-     * Force using '/' as path separator.
-     *
-     * @param string|array $path
-     * @return string|array
-     */
-    public function forcePathSlashes($path)
-    {
         if (is_array($path)) {
             $result = array();
             foreach ($path as $dir) {
-                $result[] = $this->forcePathSlashes($dir);
+                $result[] = $this->slashifyPath($dir);
             }
             return $result;
         } else {
@@ -439,11 +428,11 @@
         $wikipath = DATA_PATH;
         $wikipath = $finder->_strip_last_pathchar($wikipath);
         if (!$file)
-            return $finder->forcePathSlashes($wikipath);
+            return $finder->slashifyPath($wikipath);
         else
-            return $finder->forcePathSlashes($wikipath . '/' . $file);
+            return $finder->slashifyPath($wikipath . '/' . $file);
     } else {
-        return $finder->forcePathSlashes($file);
+        return $finder->slashifyPath($file);
     }
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.