ApiBase.php:

"Don't show No more than 500 ( for bots) allowed" when MAX2 isn't set

Trim trailing whitespace from Database.php

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 29881e7..ce3992a 100644 (file)
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -341,7 +341,11 @@ abstract class ApiBase {
                                                                $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] );

diff --git a/includes/db/Database.php b/includes/db/Database.php
index bdfb4f3..388a81e 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1383,7 +1383,7 @@ abstract class DatabaseBase implements DatabaseType {
                                $on = $this->makeList((array)$join_conds_safe[$table][1], LIST_AND);
                                if ( $on != '' ) {
                                        $tableClause .= ' ON (' . $on . ')';
-                               }                               
+                               }
                                $retJOIN[] = $tableClause;
                        } else {
                                $tableClause = $this->tableName( $table );