"Don't show No more than 500 ( for bots) allowed" when MAX2 isn't set
Trim trailing whitespace from Database.php
$desc .= $paramPrefix . $prompt . implode( ', ', MWNamespace::getValidNamespaces() );
break;
case 'limit':
- $desc .= $paramPrefix . "No more than {$paramSettings[self :: PARAM_MAX]} ({$paramSettings[self::PARAM_MAX2]} for bots) allowed";
+ $desc .= $paramPrefix . "No more than {$paramSettings[self :: PARAM_MAX]}";
+ if ( isset( $paramSettings[self::PARAM_MAX2] ) ) {
+ $desc .= " ({$paramSettings[self::PARAM_MAX2]} for bots)";
+ }
+ $desc .= ' allowed';
break;
case 'integer':
$hasMin = isset( $paramSettings[self::PARAM_MIN] );
$on = $this->makeList((array)$join_conds_safe[$table][1], LIST_AND);
if ( $on != '' ) {
$tableClause .= ' ON (' . $on . ')';
- }
+ }
$retJOIN[] = $tableClause;
} else {
$tableClause = $this->tableName( $table );