jenkins-bot has submitted this change and it was merged.
Change subject: Remove meaningless default action name
......................................................................
Remove meaningless default action name
Before: Get the value of the action=... parameter. If it's undefined
return 'view'. Check if 'view' equals 'ajax'.
After: Get the value of the action=... parameter. If it's undefined
return null. Check if null equals 'ajax'.
Same for both places. The default value 'view' is never used.
Change-Id: I56656218cfb895bffe886919c67ebf3b79d91515
---
M includes/MediaWiki.php
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
CSteipp: Looks good to me, but someone else must approve
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 9585c5f..ed77edf 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -59,7 +59,7 @@
$request = $this->context->getRequest();
$curid = $request->getInt( 'curid' );
$title = $request->getVal( 'title' );
- $action = $request->getVal( 'action', 'view' );
+ $action = $request->getVal( 'action' );
if ( $request->getCheck( 'search' ) ) {
// Compatibility with old search URLs which didn't use
Special:Search
@@ -489,8 +489,7 @@
$request = $this->context->getRequest();
// Send Ajax requests to the Ajax dispatcher.
- if ( $this->config->get( 'UseAjax' ) && $request->getVal(
'action', 'view' ) == 'ajax' ) {
-
+ if ( $this->config->get( 'UseAjax' ) && $request->getVal(
'action' ) === 'ajax' ) {
// Set a dummy title, because $wgTitle == null might
break things
$title = Title::makeTitle( NS_MAIN, 'AJAX' );
$this->context->setTitle( $title );
--
To view, visit https://gerrit.wikimedia.org/r/168962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I56656218cfb895bffe886919c67ebf3b79d91515
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: CSteipp <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
