Merge "SearchInputWidget: Pass through description data"

diff --combined resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
index 2008569,e73f347..40c0a1d
--- 1/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
--- 2/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.SearchInputWidget.js
@@@ -33,7 -33,8 +33,7 @@@
                        icon: 'search',
                        maxLength: undefined,
                        performSearchOnClick: true,
 -                      dataLocation: 'header',
 -                      namespace: 0
 +                      dataLocation: 'header'
                }, config );
  
                // Parent constructor
@@@ -183,9 -184,12 +183,12 @@@
         */
        mw.widgets.SearchInputWidget.prototype.getOptionsFromData = function ( data ) {
                var items = [],
+                       titles = data.data[ 1 ],
+                       descriptions = data.data[ 2 ],
+                       urls = data.data[ 3 ],
                        self = this;
  
-               $.each( data.data[ 1 ], function ( i, result ) {
+               $.each( titles, function ( i, result ) {
                        items.push( new mw.widgets.TitleOptionWidget(
                                self.getOptionWidgetData(
                                        result,
@@@ -193,10 -197,9 +196,9 @@@
                                        // the parent's API query.
                                        {
                                                data: result,
-                                               // data[ 3 ][ i ] is the link for this result
-                                               url: data.data[ 3 ][ i ],
-                                               imageUrl: null,
-                                               description: null,
+                                               url: urls[ i ],
+                                               imageUrl: null, // The JSON 'opensearch' API doesn't have images
+                                               description: descriptions[ i ],
                                                missing: false,
                                                redirect: false,
                                                disambiguation: false