| Index: trunk/extensions/CanonicalHref/CanonicalHref.php |
| — | — | @@ -22,14 +22,9 @@ |
| 23 | 23 | |
| 24 | 24 | |
| 25 | 25 | function canonicalHref(&$skin, &$template){ |
| 26 | | - global $wgTitle; |
| 27 | | - if (!is_object($wgTitle) || !method_exists($wgTitle, "getFullURL")){ |
| 28 | | - // Avoid a fatal error if for any reason $wgTitle isn't an object |
| 29 | | - return true; |
| 30 | | - } |
| 31 | 26 | $link = Xml::element("link", array( |
| 32 | 27 | 'rel' => 'canonical', |
| 33 | | - 'href' => $wgTitle->getFullURL() |
| | 28 | + 'href' => $skin->mTitle->getFullURL() |
| 34 | 29 | ) |
| 35 | 30 | ); |
| 36 | 31 | $template->set('headlinks', $template->data['headlinks'] . "\n" . $link . "\n"); |
| Index: trunk/extensions/SemanticMediaWiki/includes/SMW_RefreshTab.php |
| — | — | @@ -16,14 +16,14 @@ |
| 17 | 17 | * Adds an action that refreshes the article, i.e. it purges the article from |
| 18 | 18 | * the cache and thus refreshes the inline queries. |
| 19 | 19 | */ |
| 20 | | -function smwfAddRefreshTab($obj, $content_actions) { |
| 21 | | - global $wgUser, $wgTitle; |
| | 20 | +function smwfAddRefreshTab($skin, $content_actions) { |
| | 21 | + global $wgUser; |
| 22 | 22 | if($wgUser->isAllowed('delete')){ |
| 23 | 23 | wfLoadExtensionMessages('SemanticMediaWiki'); |
| 24 | 24 | $content_actions['purge'] = array( |
| 25 | 25 | 'class' => false, |
| 26 | 26 | 'text' => wfMsg('smw_purge'), |
| 27 | | - 'href' => $wgTitle->getLocalUrl( 'action=purge' ) |
| | 27 | + 'href' => $skin->mTitle->getLocalUrl( 'action=purge' ) |
| 28 | 28 | ); |
| 29 | 29 | } |
| 30 | 30 | return true; // always return true, in order not to stop MW's hook processing! |
| Index: trunk/extensions/SisterSites/SisterSites.php |
| — | — | @@ -17,11 +17,8 @@ |
| 18 | 18 | |
| 19 | 19 | function wfSisterDisplay( $out ) { |
| 20 | 20 | if( $out->isArticleRelated() ) { |
| 21 | | - global $wgTitle; |
| 22 | | - $title = $wgTitle; |
| 23 | | - |
| 24 | 21 | $sister = new SisterSitesList(); |
| 25 | | - $matches = $sister->siblings( $title ); |
| | 22 | + $matches = $sister->siblings( $out->getTitle() ); |
| 26 | 23 | |
| 27 | 24 | if( $matches ) { |
| 28 | 25 | $out->addHTML( wfSisterList( $matches ) ); |
| Index: trunk/extensions/WhiteList/WhiteListAuth.php |
| — | — | @@ -323,7 +323,7 @@ |
| 324 | 324 | } /* End class */ |
| 325 | 325 | |
| 326 | 326 | class WhiteListHooks { |
| 327 | | - function AddRestrictedPagesTab(&$personal_urls, $wgTitle) |
| | 327 | + function AddRestrictedPagesTab(&$personal_urls, $title ) |
| 328 | 328 | { |
| 329 | 329 | global $wgUser, $wgWhiteListRestrictedGroup; |
| 330 | 330 | |
| Index: trunk/extensions/WhiteList/WhiteListEdit.php |
| — | — | @@ -110,8 +110,8 @@ |
| 111 | 111 | return WhiteListExec::CheckWhiteList($title, $uwUser, $action, $result); |
| 112 | 112 | } |
| 113 | 113 | |
| 114 | | -function WL_doAddRestrictedPagesTab(&$personal_urls, $wgTitle) { |
| 115 | | - return WhiteListHooks::AddRestrictedPagesTab($personal_urls, $wgTitle); |
| | 114 | +function WL_doAddRestrictedPagesTab(&$personal_urls, $title ) { |
| | 115 | + return WhiteListHooks::AddRestrictedPagesTab($personal_urls, $title ); |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | // TODO - this is missing from Siebrand's changes |
| Index: trunk/extensions/SpamRegex/SpamRegexCore.php |
| — | — | @@ -6,7 +6,7 @@ |
| 7 | 7 | class SpamRegexHooks { |
| 8 | 8 | |
| 9 | 9 | public static function onEditFilter( $editpage ) { |
| 10 | | - global $wgOut, $wgTitle; |
| | 10 | + global $wgOut; |
| 11 | 11 | wfProfileIn( __METHOD__ ); |
| 12 | 12 | |
| 13 | 13 | // here we get only the phrases for blocking in summaries... |
| — | — | @@ -28,7 +28,7 @@ |
| 29 | 29 | $wgOut->addWikiMsg( 'spamprotectionmatch', "<nowiki>{$s_matches[0]}</nowiki>" ); |
| 30 | 30 | $wgOut->addWikiMsg( 'spamregex-summary' ); |
| 31 | 31 | |
| 32 | | - $wgOut->returnToMain( false, $wgTitle ); |
| | 32 | + $wgOut->returnToMain( false, $editpage->mTitle ); |
| 33 | 33 | wfProfileOut( __METHOD__ ); |
| 34 | 34 | return false; |
| 35 | 35 | } |
| Index: trunk/extensions/SignDocument/SpecialCreateSignDocument.php |
| — | — | @@ -33,12 +33,12 @@ |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | function buildCreateForm() { |
| 37 | | - global $wgOut, $wgGroupPermissions, $wgTitle; |
| | 37 | + global $wgOut, $wgGroupPermissions; |
| 38 | 38 | |
| 39 | 39 | $wgOut->addWikiText( wfMsg( 'createsigndoc-head' ) ); |
| 40 | 40 | |
| 41 | 41 | $wgOut->addHTML(' |
| 42 | | - <form action="'. $wgTitle->escapeLocalUrl() .'" method="post"> |
| | 42 | + <form action="'. $this->getTitle()->escapeLocalUrl() .'" method="post"> |
| 43 | 43 | <table><tr><td> |
| 44 | 44 | <strong>' . wfMsg( 'createsigndoc-pagename' ) . ' </strong> |
| 45 | 45 | </td><td> |
| Index: trunk/extensions/WikiArticleFeeds/WikiArticleFeeds.php |
| — | — | @@ -236,9 +236,9 @@ |
| 237 | 237 | # If its not being fed by feedBurner, do it ourselves! |
| 238 | 238 | if ( !array_key_exists( 'href', $rssArr ) || !$rssArr['href'] ) { |
| 239 | 239 | |
| 240 | | - global $wgServer, $wgScript, $wgTitle; |
| | 240 | + global $wgServer, $wgScript; |
| 241 | 241 | |
| 242 | | - $baseUrl = $wgServer . $wgScript . '?title=' . $wgTitle->getDBkey() . '&action=feed&feed='; |
| | 242 | + $baseUrl = $wgServer . $wgScript . '?title=' . $out->getTitle()->getDBkey() . '&action=feed&feed='; |
| 243 | 243 | $rssArr['href'] = $baseUrl . 'rss'; |
| 244 | 244 | $atomArr['href'] = $baseUrl . 'atom'; |
| 245 | 245 | } |
| Index: trunk/extensions/MetavidWiki/includes/MV_GlobalFunctions.php |
| — | — | @@ -353,7 +353,7 @@ |
| 354 | 354 | * enables linkback and autocomplete for search |
| 355 | 355 | */ |
| 356 | 356 | function mvfAutoAllPageHeader() { |
| 357 | | - global $mvgScriptPath, $wgJsMimeType, $wgOut, $mvExtraHeader, $wgTitle, $mvgJSDebug, $wgEnableScriptLoader, $wgRequest, $wgScriptPath; |
| | 357 | + global $mvgScriptPath, $wgJsMimeType, $wgOut, $mvExtraHeader, $mvgJSDebug, $wgEnableScriptLoader, $wgRequest, $wgScriptPath; |
| 358 | 358 | |
| 359 | 359 | $mvgScriptPath = htmlspecialchars( $mvgScriptPath ); |
| 360 | 360 | $wgJsMimeType = htmlspecialchars( $wgJsMimeType ) ; |
| Index: trunk/extensions/FlaggedRevs/specialpages/ProblemPages_body.php |
| — | — | @@ -37,11 +37,11 @@ |
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | protected function showForm() { |
| 41 | | - global $wgOut, $wgTitle, $wgScript, $wgFlaggedRevsNamespaces; |
| | 41 | + global $wgOut, $wgScript, $wgFlaggedRevsNamespaces; |
| 42 | 42 | $form = Xml::openElement( 'form', |
| 43 | 43 | array( 'name' => 'reviewedpages', 'action' => $wgScript, 'method' => 'get' ) ); |
| 44 | 44 | $form .= "<fieldset><legend>".wfMsgHtml('problempages-leg')."</legend>\n"; |
| 45 | | - $form .= Xml::hidden( 'title', $wgTitle->getPrefixedDBKey() ); |
| | 45 | + $form .= Xml::hidden( 'title', $this->getTitle()->getPrefixedDBKey() ); |
| 46 | 46 | if( count($wgFlaggedRevsNamespaces) > 1 ) { |
| 47 | 47 | $form .= FlaggedRevsXML::getNamespaceMenu( $this->namespace ) . ' '; |
| 48 | 48 | } |
| Index: trunk/extensions/FlaggedRevs/specialpages/RevisionReview_body.php |
| — | — | @@ -278,7 +278,7 @@ |
| 279 | 279 | * Show revision review form |
| 280 | 280 | */ |
| 281 | 281 | private function showRevision() { |
| 282 | | - global $wgOut, $wgUser, $wgTitle, $wgFlaggedRevComments; |
| | 282 | + global $wgOut, $wgUser, $wgFlaggedRevComments; |
| 283 | 283 | |
| 284 | 284 | if( $this->unapprovedTags ) |
| 285 | 285 | $wgOut->addWikiText( '<strong>' . wfMsg( 'revreview-toolow' ) . '</strong>' ); |
| — | — | @@ -301,7 +301,7 @@ |
| 302 | 302 | if( FlaggedRevs::showStableByDefault() ) |
| 303 | 303 | $wgOut->addWikiText( wfMsg('revreview-text') ); |
| 304 | 304 | |
| 305 | | - $action = $wgTitle->escapeLocalUrl( 'action=submit' ); |
| | 305 | + $action = $this->getTitle()->escapeLocalUrl( 'action=submit' ); |
| 306 | 306 | $form = "<form name='RevisionReview' action='$action' method='post'>"; |
| 307 | 307 | $form .= '<fieldset><legend>' . wfMsgHtml( 'revreview-legend' ) . '</legend><table><tr>'; |
| 308 | 308 | |
| Index: trunk/extensions/FlaggedRevs/specialpages/QualityOversight_body.php |
| — | — | @@ -64,11 +64,11 @@ |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | private function showForm() { |
| 68 | | - global $wgOut, $wgTitle, $wgScript; |
| | 68 | + global $wgOut, $wgScript; |
| 69 | 69 | $wgOut->addHTML( |
| 70 | 70 | Xml::openElement( 'form', array('name' => 'qualityoversight','action' => $wgScript,'method' => 'get') ) . |
| 71 | 71 | '<fieldset><legend>' . wfMsgHtml('qualityoversight-legend') . '</legend><p>' . |
| 72 | | - Xml::hidden( 'title', $wgTitle->getPrefixedDBKey() ) . |
| | 72 | + Xml::hidden( 'title', $this->getTitle()->getPrefixedDBKey() ) . |
| 73 | 73 | FlaggedRevsXML::getNamespaceMenu( $this->namespace ) . ' ' . |
| 74 | 74 | ( FlaggedRevs::qualityVersions() ? |
| 75 | 75 | FlaggedRevsXML::getLevelMenu( $this->level, 'revreview-filter-all', 1 ) . ' ' |
| Index: trunk/extensions/FlaggedRevs/specialpages/ReviewedPages_body.php |
| — | — | @@ -30,7 +30,7 @@ |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | public function showForm() { |
| 34 | | - global $wgOut, $wgTitle, $wgScript, $wgFlaggedRevsNamespaces; |
| | 34 | + global $wgOut, $wgScript, $wgFlaggedRevsNamespaces; |
| 35 | 35 | |
| 36 | 36 | $form = Xml::openElement( 'form', |
| 37 | 37 | array( 'name' => 'reviewedpages', 'action' => $wgScript, 'method' => 'get' ) ); |
| — | — | @@ -51,7 +51,7 @@ |
| 52 | 52 | $form .= $showhideredirs . ' '; |
| 53 | 53 | |
| 54 | 54 | $form .= " ".Xml::submitButton( wfMsg( 'go' ) ); |
| 55 | | - $form .= Xml::hidden( 'title', $wgTitle->getPrefixedDBKey() ); |
| | 55 | + $form .= Xml::hidden( 'title', $this->getTitle()->getPrefixedDBKey() ); |
| 56 | 56 | $form .= "</fieldset></form>\n"; |
| 57 | 57 | |
| 58 | 58 | $wgOut->addHTML( $form ); |
| Index: trunk/extensions/TodoTasks/SpecialTaskList_body.php |
| — | — | @@ -194,7 +194,7 @@ |
| 195 | 195 | return $text; |
| 196 | 196 | } |
| 197 | 197 | |
| 198 | | -function addPersonalUrl(&$personal_urls, $wgTitle) |
| | 198 | +function addPersonalUrl( &$personal_urls, $title ) |
| 199 | 199 | { |
| 200 | 200 | global $wgOut, $wgUser; |
| 201 | 201 | |