* (bug 28702) Undefined offset in ApiParamInfo.php

Followup r85758 (bug 28254)

If no DFLT is set, fall back to "null", which means a string parameter

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4b5ceab..2a032cb 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -352,6 +352,7 @@ PHP if you have not done so prior to upgrading MediaWiki.
 * (bug 26882) Allow listing of indefinite protections with the api
 * (bug 27344) add drprefix param to list=deletedrevs
 * (bug 28560) list=deletedrevs should die, if combination of param is invalid
+* (bug 28702) Undefined offset in ApiParamInfo.php
 
 === Languages updated in 1.18 ===
 

diff --git a/includes/api/ApiParamInfo.php b/includes/api/ApiParamInfo.php
index ac91ea3..ed3b450 100644 (file)
--- a/includes/api/ApiParamInfo.php
+++ b/includes/api/ApiParamInfo.php
@@ -131,7 +131,7 @@ class ApiParamInfo extends ApiBase {
 
                        //handle missing type
                        if ( !isset( $p[ApiBase::PARAM_TYPE] ) ) {
-                               $dflt = $p[ApiBase::PARAM_DFLT];
+                               $dflt = isset( $p[ApiBase::PARAM_DFLT] ) ? $p[ApiBase::PARAM_DFLT] : null;
                                if ( is_bool( $dflt ) ) {
                                        $p[ApiBase::PARAM_TYPE] = 'bool';
                                } elseif ( is_string( $dflt ) || is_null( $dflt ) ) {