wfProfileIn( __METHOD__ );
$output->setTitle( $title );
+ if( $request->getVal( 'printable' ) === 'yes' ) {
+ $output->setPrintable();
+ }
wfRunHooks( 'BeforeInitialize', array( &$title, &$article, &$output, &$user, $request, $this ) );
/**
* Checks some initial queries
- * Note that $title here is *not* a Title object, but a string!
*
- * @param $title String
- * @param $action String
+ * @param $request WebRequest
* @return Title object to be $wgTitle
*/
- function checkInitialQueries( $title, $action ) {
- global $wgOut, $wgRequest, $wgContLang;
- if( $wgRequest->getVal( 'printable' ) === 'yes' ) {
- $wgOut->setPrintable();
- }
+ function checkInitialQueries( WebRequest $request ) {
+ global $wgContLang;
- $curid = $wgRequest->getInt( 'curid' );
- if( $wgRequest->getCheck( 'search' ) ) {
+ $curid = $request->getInt( 'curid' );
+ $title = $request->getVal( 'title' );
+
+ if( $request->getCheck( 'search' ) ) {
// Compatibility with old search URLs which didn't use Special:Search
// Just check for presence here, so blank requests still
// show the search page when using ugly URLs (bug 8054).
} elseif( $curid ) {
// URLs like this are generated by RC, because rc_title isn't always accurate
$ret = Title::newFromID( $curid );
- } elseif( $title == '' && $action != 'delete' ) {
+ } elseif( $title == '' && $this->getAction( $request ) != 'delete' ) {
$ret = Title::newMainPage();
} else {
$ret = Title::newFromURL( $title );
// For non-special titles, check for implicit titles
if( is_null( $ret ) || $ret->getNamespace() != NS_SPECIAL ) {
// We can have urls with just ?diff=,?oldid= or even just ?diff=
- $oldid = $wgRequest->getInt( 'oldid' );
- $oldid = $oldid ? $oldid : $wgRequest->getInt( 'diff' );
+ $oldid = $request->getInt( 'oldid' );
+ $oldid = $oldid ? $oldid : $request->getInt( 'diff' );
// Allow oldid to override a changed or missing title
if( $oldid ) {
$rev = Revision::newFromId( $oldid );
function handleSpecialCases( &$title, &$output, $request ) {
wfProfileIn( __METHOD__ );
- $action = $this->getVal( 'Action' );
-
// Invalid titles. Bug 21776: The interwikis must redirect even if the page name is empty.
if( is_null($title) || ( ( $title->getDBkey() == '' ) && ( $title->getInterwiki() == '' ) ) ) {
$title = SpecialPage::getTitleFor( 'Badtitle' );
throw new ErrorPageError( 'badtitle', 'badtitletext' );
}
// Redirect loops, no title in URL, $wgUsePathInfo URLs, and URLs with a variant
- } else if ( $action == 'view' && !$request->wasPosted()
+ } else if ( $request->getVal( 'action', 'view' ) == 'view' && !$request->wasPosted()
&& ( $request->getVal( 'title' ) === null || $title->getPrefixedDBKey() != $request->getText( 'title' ) )
&& !count( array_diff( array_keys( $request->getValues() ), array( 'action', 'title' ) ) ) )
{
}
}
+ /**
+ * Returns the action that will be executed, not necesserly the one passed
+ * passed through the "action" parameter. Actions disabled in
+ * $wgDisabledActions will be replaced by "nosuchaction"
+ *
+ * @param $request WebRequest
+ * @return String: action
+ */
+ public function getAction( WebRequest $request ) {
+ global $wgDisabledActions;
+
+ $action = $request->getVal( 'action', 'view' );
+
+ // Check for disabled actions
+ if( in_array( $action, $wgDisabledActions ) ) {
+ return 'nosuchaction';
+ }
+
+ // Workaround for bug #20966: inability of IE to provide an action dependent
+ // on which submit button is clicked.
+ if ( $action === 'historysubmit' ) {
+ if ( $request->getBool( 'revisiondelete' ) ) {
+ return 'revisiondelete';
+ } elseif ( $request->getBool( 'revisionmove' ) ) {
+ return 'revisionmove';
+ } else {
+ return 'view';
+ }
+ } elseif ( $action == 'editredlink' ) {
+ return 'edit';
+ }
+
+ return $action;
+ }
+
/**
* Initialize the object to be known as $wgArticle for "standard" actions
* Create an Article object for the page, following redirects if needed.
function initializeArticle( &$title, &$output, $request ) {
wfProfileIn( __METHOD__ );
- $action = $this->getVal( 'action', 'view' );
+ $action = $request->getVal( 'action', 'view' );
$article = self::articleFromTitle( $title );
// NS_MEDIAWIKI has no redirects.
// It is also used for CSS/JS, so performance matters here...
// Give extensions a change to ignore/handle redirects as needed
$ignoreRedirect = $target = false;
- $dbr = wfGetDB( DB_SLAVE );
- $article->loadPageData( $article->pageDataFromTitle( $dbr, $title ) );
-
wfRunHooks( 'InitializeArticleMaybeRedirect',
array(&$title,&$request,&$ignoreRedirect,&$target,&$article) );
if( is_object($target) ) {
// Rewrite environment to redirected article
$rarticle = self::articleFromTitle( $target );
- $rarticle->loadPageData( $rarticle->pageDataFromTitle( $dbr, $target ) );
+ $rarticle->loadPageData();
if( $rarticle->exists() || ( is_object( $file ) && !$file->isLocal() ) ) {
$rarticle->setRedirectedFrom( $title );
$article = $rarticle;
return;
}
- $action = $this->getVal( 'Action' );
- if( in_array( $action, $this->getVal( 'DisabledActions', array() ) ) ) {
- /* No such action; this will switch to the default case */
- $action = 'nosuchaction';
- }
-
- // Workaround for bug #20966: inability of IE to provide an action dependent
- // on which submit button is clicked.
- if ( $action === 'historysubmit' ) {
- if ( $request->getBool( 'revisiondelete' ) ) {
- $action = 'revisiondelete';
- } elseif ( $request->getBool( 'revisionmove' ) ) {
- $action = 'revisionmove';
- } else {
- $action = 'view';
- }
- }
+ $action = $this->getAction( $request );
switch( $action ) {
case 'view':
}
/* Continue... */
case 'edit':
- case 'editredlink':
if( wfRunHooks( 'CustomEditor', array( $article, $user ) ) ) {
$internal = $request->getVal( 'internaledit' );
$external = $request->getVal( 'externaledit' );
dépôts / lhc / web / wiklou.git / blobdiff