Changeset 8767

Timestamp:

05/04/08 13:47:08 (5 months ago)

Author:

fabien

Message:

changed sfFinder to return the symlink path instead of the real path (needed when you use ->relative(), and if not, well, it's the same directory anyway - closes #3421)

Files:

• branches/1.1/lib/util/sfFinder.class.php (modified) (4 diffs)

branches/1.1/lib/util/sfFinder.class.php

@@ -393 +393 @@
-    }
-
+    $dir = realpath($dir);
+
-    if (is_link($dir) && !$this->follow_link)
-    {
@@ -424 +426 @@
-            if (($this->type == 'directory' || $this->type == 'any') && ($depth >= $this->mindepth) && !$this->is_discarded($dir, $entryname) && $this->match_names($dir, $entryname) && $this->exec_ok($dir, $entryname))
-            {
-realpath($current_entry)
+$current_entry
-            }
-
@@ -439 +441 @@
-            if ($this->sort == 'type')
-            {
-realpath($current_entry)
+$current_entry
-            }
-            else
-            {
-realpath($current_entry)
+$current_entry
-            }
-          }
@@ -456 +458 @@
-          if (($this->type == 'directory' || $this->type == 'any') && ($depth >= $this->mindepth) && !$this->is_discarded($dir, $entryname) && $this->match_names($dir, $entryname) && $this->exec_ok($dir, $entryname))
-          {
-realpath($current_entry)
+$current_entry
-          }
-