Merge "Consistently handle trailing slashes in subpage links."

diff --combined includes/Linker.php
index 1b0803c,168136e..d84e5d0
--- 1/includes/Linker.php
--- 2/includes/Linker.php
+++ b/includes/Linker.php
@@@ -209,9 -209,8 +209,9 @@@ class Linker 
                $dummy = new DummyLinker; // dummy linker instance for bc on the hooks
  
                $ret = null;
 -              if ( !wfRunHooks( 'LinkBegin', array( $dummy, $target, &$html,
 -              &$customAttribs, &$query, &$options, &$ret ) ) ) {
 +              if ( !wfRunHooks( 'LinkBegin',
 +                      array( $dummy, $target, &$html, &$customAttribs, &$query, &$options, &$ret ) )
 +              ) {
                        wfProfileOut( __METHOD__ );
                        return $ret;
                }
@@@ -1491,9 -1490,12 +1491,12 @@@
                # Foobar -- normal
                # :Foobar -- override special treatment of prefix (images, language links)
                # /Foobar -- convert to CurrentPage/Foobar
-               # /Foobar/ -- convert to CurrentPage/Foobar, strip the initial / from text
+               # /Foobar/ -- convert to CurrentPage/Foobar, strip the initial and final / from text
                # ../ -- convert to CurrentPage, from CurrentPage/CurrentSubPage
-               # ../Foobar -- convert to CurrentPage/Foobar, from CurrentPage/CurrentSubPage
+               # ../Foobar -- convert to CurrentPage/Foobar,
+               #              (from CurrentPage/CurrentSubPage)
+               # ../Foobar/ -- convert to CurrentPage/Foobar, use 'Foobar' as text
+               #              (from CurrentPage/CurrentSubPage)
  
                wfProfileIn( __METHOD__ );
                $ret = $target; # default return value is no change
@@@ -1539,7 -1541,7 +1542,7 @@@
                                                $ret = implode( '/', array_slice( $exploded, 0, -$dotdotcount ) );
                                                # / at the end means don't show full path
                                                if ( substr( $nodotdot, -1, 1 ) === '/' ) {
-                                                       $nodotdot = substr( $nodotdot, 0, -1 );
+                                                       $nodotdot = rtrim( $nodotdot, '/' );
                                                        if ( $text === '' ) {
                                                                $text = $nodotdot . $suffix;
                                                        }