http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100264
Revision: 100264
Author: jeroendedauw
Date: 2011-10-19 19:38:17 +0000 (Wed, 19 Oct 2011)
Log Message:
-----------
we want to get the edit token, not edit the token...
Modified Paths:
--------------
trunk/phase3/includes/User.php
Modified: trunk/phase3/includes/User.php
===================================================================
--- trunk/phase3/includes/User.php 2011-10-19 19:35:57 UTC (rev 100263)
+++ trunk/phase3/includes/User.php 2011-10-19 19:38:17 UTC (rev 100264)
@@ -3160,16 +3160,30 @@
}
/**
+ * Alias for getEditToken.
+ * @deprecated since 1.19, use getEditToken instead.
+ *
+ * @param $salt String|Array of Strings Optional function-specific data
for hashing
+ * @param $request WebRequest object to use or null to use $wgRequest
+ * @return String The new edit token
+ */
+ public function editToken( $salt = '', $request = null ) {
+ return $this->getEditToken( $salt, $request );
+ }
+
+ /**
* Initialize (if necessary) and return a session token value
* which can be used in edit forms to show that the user's
* login credentials aren't being hijacked with a foreign form
* submission.
*
+ * @since 1.19
+ *
* @param $salt String|Array of Strings Optional function-specific data
for hashing
* @param $request WebRequest object to use or null to use $wgRequest
* @return String The new edit token
*/
- public function editToken( $salt = '', $request = null ) {
+ public function getEditToken( $salt = '', $request = null ) {
if ( $request == null ) {
$request = $this->getRequest();
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
