Index: trunk/extensions/OpenID/SpecialOpenIDServer.body.php |
— | — | @@ -741,9 +741,13 @@ |
742 | 742 | |
743 | 743 | /* remove "Special:OpenIDXRDS/" to allow construction of a valid user page name */ |
744 | 744 | $specialPagePrefix = SpecialPage::getTitleFor( 'OpenIDXRDS' ); |
745 | | - if ( $specialPagePrefix != "Special:OpenIDXRDS" ) $specialPagePrefix = "({$specialPagePrefix}|Special:OpenIDXRDS)"; |
746 | | - $relative = preg_replace( "!" . $specialPagePrefix . "/!", "", $relative ); |
747 | 745 | |
| 746 | + if ( $specialPagePrefix != "Special:OpenIDXRDS" ) { |
| 747 | + $specialPagePrefix = "( {$specialPagePrefix} | Special:OpenIDXRDS )"; |
| 748 | + } |
| 749 | + |
| 750 | + $relative = preg_replace( "!" . preg_quote( $specialPagePrefix, "!" ) . "/!", "", $relative ); |
| 751 | + |
748 | 752 | # Can't have a pound-sign in the relative, since that's for fragments |
749 | 753 | if ( !preg_match( "#$pattern#", $relative, $matches ) ) { |
750 | 754 | return null; |
Index: trunk/extensions/OpenID/OpenID.php |
— | — | @@ -27,7 +27,7 @@ |
28 | 28 | exit( 1 ); |
29 | 29 | } |
30 | 30 | |
31 | | -define( 'MEDIAWIKI_OPENID_VERSION', '0.935-beta 20110830' ); |
| 31 | +define( 'MEDIAWIKI_OPENID_VERSION', '0.936-beta 20110831' ); |
32 | 32 | |
33 | 33 | $path = dirname( __FILE__ ); |
34 | 34 | set_include_path( implode( PATH_SEPARATOR, array( $path ) ) . PATH_SEPARATOR . get_include_path() ); |