From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 20 Mar 2014 18:20:10 +0000 (+0000)
Subject: Merge "mediawiki.page.watch.ajax: Fail early if updateWatchLink is called wrong"
X-Git-Tag: 1.31.0-rc.0~16557
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=eed31dbcd9f5ba292ba411094d6fbf86844ad726;p=lhc%2Fweb%2Fwiklou.git

Merge "mediawiki.page.watch.ajax: Fail early if updateWatchLink is called wrong"
---

eed31dbcd9f5ba292ba411094d6fbf86844ad726
diff --cc resources/mediawiki.page/mediawiki.page.watch.ajax.js
index a491c6ad50,1041e7f9f3..850177f433
--- a/resources/mediawiki.page/mediawiki.page.watch.ajax.js
+++ b/resources/mediawiki.page/mediawiki.page.watch.ajax.js
@@@ -69,10 -79,8 +79,8 @@@
  	function mwUriGetAction( url ) {
  		var action, actionPaths, key, i, m, parts;
  
- 		actionPaths = mw.config.get( 'wgActionPaths' );
- 
  		// TODO: Does MediaWiki give action path or query param
 -		// precedence ? If the former, move this to the bottom
 +		// precedence? If the former, move this to the bottom
  		action = mw.util.getParamValue( 'action', url );
  		if ( action !== null ) {
  			return action;