| Index: trunk/phase3/includes/api/ApiMain.php |
| — | — | @@ -370,9 +370,8 @@ |
| 371 | 371 | /* If the help message is requested in the default (xmlfm) format, |
| 372 | 372 | * tell the printer not to escape ampersands so that our links do |
| 373 | 373 | * not break. */ |
| 374 | | - $params = $this->extractRequestParams(); |
| 375 | 374 | $printer->setUnescapeAmps ( ( $this->mAction == 'help' || $isError ) |
| 376 | | - && $params['format'] == ApiMain::API_DEFAULT_FORMAT ); |
| | 375 | + && $this->getParameter('format') == ApiMain::API_DEFAULT_FORMAT ); |
| 377 | 376 | |
| 378 | 377 | $printer->initPrinter($isError); |
| 379 | 378 | |
| Index: trunk/phase3/includes/api/ApiBase.php |
| — | — | @@ -353,10 +353,10 @@ |
| 354 | 354 | /** |
| 355 | 355 | * Get a value for the given parameter |
| 356 | 356 | */ |
| 357 | | - protected function getParameter($paramName) { |
| | 357 | + protected function getParameter($paramName, $parseMaxLimit = true) { |
| 358 | 358 | $params = $this->getAllowedParams(); |
| 359 | 359 | $paramSettings = $params[$paramName]; |
| 360 | | - return $this->getParameterFromSettings($paramName, $paramSettings); |
| | 360 | + return $this->getParameterFromSettings($paramName, $paramSettings, $parseMaxLimit); |
| 361 | 361 | } |
| 362 | 362 | |
| 363 | 363 | /** |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -194,6 +194,7 @@ |
| 195 | 195 | * (bug 11633) Explicitly convert redirect titles to strings due to PHP's |
| 196 | 196 | very weak typing on array keys. |
| 197 | 197 | * (bug 12136) Extend allowed characters in JSON callback to ][.'"_A-Za-z0-9 |
| | 198 | +* (bug 11673) Return error 'unknown_action' in specified format |
| 198 | 199 | |
| 199 | 200 | === Languages updated in 1.13 === |
| 200 | 201 | |