| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -47,6 +47,7 @@ |
| 48 | 48 | */ |
| 49 | 49 | const GAID_FOR_UPDATE = 1; |
| 50 | 50 | |
| | 51 | + |
| 51 | 52 | /** |
| 52 | 53 | * @name Private member variables |
| 53 | 54 | * Please use the accessor functions instead. |
| — | — | @@ -758,7 +759,7 @@ |
| 759 | 760 | |
| 760 | 761 | /** |
| 761 | 762 | * Return the prefixed title with spaces _without_ the interwiki prefix |
| 762 | | - * |
| | 763 | + * |
| 763 | 764 | * @return \type{\string} the title, prefixed by the namespace but not by the interwiki prefix, with spaces |
| 764 | 765 | */ |
| 765 | 766 | public function getSemiPrefixedText() { |
| — | — | @@ -767,7 +768,7 @@ |
| 768 | 769 | $s = str_replace( '_', ' ', $s ); |
| 769 | 770 | $this->mSemiPrefixedText = $s; |
| 770 | 771 | } |
| 771 | | - return $this->mSemiPrefixedText; |
| | 772 | + return $this->mSemiPrefixedText; |
| 772 | 773 | } |
| 773 | 774 | |
| 774 | 775 | /** |
| — | — | @@ -998,7 +999,7 @@ |
| 999 | 1000 | public function escapeFullURL( $query = '' ) { |
| 1000 | 1001 | return htmlspecialchars( $this->getFullURL( $query ) ); |
| 1001 | 1002 | } |
| 1002 | | - |
| | 1003 | + |
| 1003 | 1004 | /** |
| 1004 | 1005 | * HTML-escaped version of getCanonicalURL() |
| 1005 | 1006 | */ |
| — | — | @@ -1010,7 +1011,7 @@ |
| 1011 | 1012 | * Get the URL form for an internal link. |
| 1012 | 1013 | * - Used in various Squid-related code, in case we have a different |
| 1013 | 1014 | * internal hostname for the server from the exposed one. |
| 1014 | | - * |
| | 1015 | + * |
| 1015 | 1016 | * This uses $wgInternalServer to qualify the path, or $wgServer |
| 1016 | 1017 | * if $wgInternalServer is not set. If the server variable used is |
| 1017 | 1018 | * protocol-relative, the URL will be expanded to http:// |
| — | — | @@ -1035,9 +1036,9 @@ |
| 1036 | 1037 | * Get the URL for a canonical link, for use in things like IRC and |
| 1037 | 1038 | * e-mail notifications. Uses $wgCanonicalServer and the |
| 1038 | 1039 | * GetCanonicalURL hook. |
| 1039 | | - * |
| | 1040 | + * |
| 1040 | 1041 | * NOTE: Unlike getInternalURL(), the canonical URL includes the fragment |
| 1041 | | - * |
| | 1042 | + * |
| 1042 | 1043 | * @param $query string An optional query string |
| 1043 | 1044 | * @param $variant string Language variant of URL (for sr, zh, ...) |
| 1044 | 1045 | * @return string The URL |
| — | — | @@ -3379,15 +3380,15 @@ |
| 3380 | 3381 | array( 'rc_timestamp' => $rcts, 'rc_namespace' => $newns, 'rc_title' => $newdbk, 'rc_new' => 1 ), |
| 3381 | 3382 | __METHOD__ |
| 3382 | 3383 | ); |
| 3383 | | - |
| | 3384 | + |
| 3384 | 3385 | if ( $wgEnableInterwikiTemplatesTracking && $wgGlobalDatabase ) { |
| 3385 | 3386 | $dbw2 = wfGetDB( DB_MASTER, array(), $wgGlobalDatabase ); |
| 3386 | 3387 | $dbw2->delete( 'globaltemplatelinks', |
| 3387 | 3388 | array( 'gtl_from_wiki' => wfGetID(), |
| 3388 | 3389 | 'gtl_from_page' => $newid ), |
| 3389 | 3390 | __METHOD__ ); |
| | 3391 | + } |
| 3390 | 3392 | } |
| 3391 | | - } |
| 3392 | 3393 | |
| 3393 | 3394 | # Save a null revision in the page's history notifying of the move |
| 3394 | 3395 | $nullRevision = Revision::newNullRevision( $dbw, $oldid, $comment, true ); |
| — | — | @@ -3860,18 +3861,6 @@ |
| 3861 | 3862 | } |
| 3862 | 3863 | |
| 3863 | 3864 | /** |
| 3864 | | - * Check if this title is a subpage of another title |
| 3865 | | - * |
| 3866 | | - * @param $title Title |
| 3867 | | - * @return Bool |
| 3868 | | - */ |
| 3869 | | - public function isSubpageOf( Title $title ) { |
| 3870 | | - return $this->getInterwiki() === $title->getInterwiki() |
| 3871 | | - && $this->getNamespace() == $title->getNamespace() |
| 3872 | | - && strpos( $this->getDBkey(), $title->getDBkey() . '/' ) === 0; |
| 3873 | | - } |
| 3874 | | - |
| 3875 | | - /** |
| 3876 | 3865 | * Callback for usort() to do title sorts by (namespace, title) |
| 3877 | 3866 | * |
| 3878 | 3867 | * @param $a Title |