| Index: trunk/phase3/includes/User.php |
| — | — | @@ -3160,16 +3160,30 @@ |
| 3161 | 3161 | } |
| 3162 | 3162 | |
| 3163 | 3163 | /** |
| | 3164 | + * Alias for getEditToken. |
| | 3165 | + * @deprecated since 1.19, use getEditToken instead. |
| | 3166 | + * |
| | 3167 | + * @param $salt String|Array of Strings Optional function-specific data for hashing |
| | 3168 | + * @param $request WebRequest object to use or null to use $wgRequest |
| | 3169 | + * @return String The new edit token |
| | 3170 | + */ |
| | 3171 | + public function editToken( $salt = '', $request = null ) { |
| | 3172 | + return $this->getEditToken( $salt, $request ); |
| | 3173 | + } |
| | 3174 | + |
| | 3175 | + /** |
| 3164 | 3176 | * Initialize (if necessary) and return a session token value |
| 3165 | 3177 | * which can be used in edit forms to show that the user's |
| 3166 | 3178 | * login credentials aren't being hijacked with a foreign form |
| 3167 | 3179 | * submission. |
| 3168 | 3180 | * |
| | 3181 | + * @since 1.19 |
| | 3182 | + * |
| 3169 | 3183 | * @param $salt String|Array of Strings Optional function-specific data for hashing |
| 3170 | 3184 | * @param $request WebRequest object to use or null to use $wgRequest |
| 3171 | 3185 | * @return String The new edit token |
| 3172 | 3186 | */ |
| 3173 | | - public function editToken( $salt = '', $request = null ) { |
| | 3187 | + public function getEditToken( $salt = '', $request = null ) { |
| 3174 | 3188 | if ( $request == null ) { |
| 3175 | 3189 | $request = $this->getRequest(); |
| 3176 | 3190 | } |