Fixed problem of User DaB. not being able to log in.
authorJens Frank <jeluf@users.mediawiki.org>
Thu, 24 Jun 2004 21:33:43 +0000 (21:33 +0000)
committerJens Frank <jeluf@users.mediawiki.org>
Thu, 24 Jun 2004 21:33:43 +0000 (21:33 +0000)
includes/Skin.php
includes/Title.php

index 3d9f138..37d6d47 100644 (file)
@@ -1774,7 +1774,7 @@ class Skin {
                if(!is_object($title)) {
                        $title = Title::newFromText( $name );
                        if(!is_object($title)) {
-                               $title = Title::newFromText( '<error: link target missing>' );
+                               $title = Title::newFromText( '--error: link target missing--' );
                        }
                }
        }
index bdb8370..35ae3e8 100644 (file)
@@ -726,7 +726,12 @@ class Title {
                }
                
                # "." and ".." conflict with the directories of those namesa
-               if ( $r === "." || $r === ".." || strpos( $r, "./" ) !== false ) {
+               if ( strpos( $r, "." ) !== false &&
+                    ( $r === "." || $r === ".." ||
+                      strpos( $r, "./" ) === 0 ||
+                      strpos( $r, "/./" !== false ) ||
+                      strpos( $r, "/../" !== false ) ) )
+               {
                        return false;
                }