| Index: trunk/phase3/includes/db/Database.php |
| — | — | @@ -1329,7 +1329,7 @@ |
| 1330 | 1330 | * Makes an encoded list of strings from an array |
| 1331 | 1331 | * $mode: |
| 1332 | 1332 | * LIST_COMMA - comma separated, no field names |
| 1333 | | - * LIST_AND - ANDed WHERE clause (without the WHERE) |
| | 1333 | + * LIST_ANDLIST_AND - ANDed WHERE clause (without the WHERE) |
| 1334 | 1334 | * LIST_OR - ORed WHERE clause (without the WHERE) |
| 1335 | 1335 | * LIST_SET - comma separated with field names, like a SET clause |
| 1336 | 1336 | * LIST_NAMES - comma separated field names |
| Index: trunk/phase3/includes/api/ApiBase.php |
| — | — | @@ -366,10 +366,17 @@ |
| 367 | 367 | } |
| 368 | 368 | break; |
| 369 | 369 | } |
| | 370 | + |
| | 371 | + if ( isset( $paramSettings[self::PARAM_ISMULTI] ) ) { |
| | 372 | + $desc .= $paramPrefix . "Maximum number of values " . |
| | 373 | + self::LIMIT_SML1 . " (" . self::LIMIT_SML2 . " for bots)"; |
| | 374 | + } |
| 370 | 375 | } |
| 371 | 376 | } |
| 372 | 377 | |
| 373 | | - $default = is_array( $paramSettings ) ? ( isset( $paramSettings[self::PARAM_DFLT] ) ? $paramSettings[self::PARAM_DFLT] : null ) : $paramSettings; |
| | 378 | + $default = is_array( $paramSettings ) |
| | 379 | + ? ( isset( $paramSettings[self::PARAM_DFLT] ) ? $paramSettings[self::PARAM_DFLT] : null ) |
| | 380 | + : $paramSettings; |
| 374 | 381 | if ( !is_null( $default ) && $default !== false ) { |
| 375 | 382 | $desc .= $paramPrefix . "Default: $default"; |
| 376 | 383 | } |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -443,6 +443,8 @@ |
| 444 | 444 | case. |
| 445 | 445 | * (bug 26164) Potential html injection when the database server isn't available |
| 446 | 446 | * (bug 26160) Upload description set by extensions are not propagated |
| | 447 | +* (bug 9675) generateSitemap.php now takes an --urlpath parameter to allow |
| | 448 | + absolute URLs in the sitemap index (as required e.g. by Google) |
| 447 | 449 | |
| 448 | 450 | === API changes in 1.17 === |
| 449 | 451 | * (bug 22738) Allow filtering by action type on query=logevent. |
| — | — | @@ -543,8 +545,7 @@ |
| 544 | 546 | * (bug 26125) prop=imageinfo&iiprop=size now returns the page count if the |
| 545 | 547 | file is a multi-page file |
| 546 | 548 | * (bug 10268) Added linktodiffs parameter on action=feedwatchlist |
| 547 | | -* (bug 9675) generateSitemap.php now takes an --urlpath parameter to allow |
| 548 | | - absolute URLs in the sitemap index (as required e.g. by Google) |
| | 549 | +* (bug 26219) Show API limits for multi values in description |
| 549 | 550 | |
| 550 | 551 | === Languages updated in 1.17 === |
| 551 | 552 | |