GeezerVison is showing static-codereview.wikimedia.org — r82025 MediaWiki - Code Review archive
r82025 MediaWiki - Code Review archive
| Repository: | MediaWiki |
| Revision: | < r82024 | r82025 | r82026 > |
| Date: | 20:08, 12 February 2011 |
| Author: | krinkle |
| Status: | ok |
| Tags: | |
| Comment: | Since mwsuggest.js is no longer used in core, wgMWSuggestTemplate is not defined either.
This variable was previously defined by default.
Gadgets using this broke with 1.17 since they assumed wgMWSuggestTemplate was defined just like mwsuggest.js did.
I've added the definition for it inside the file itself. |
| Modified paths: |
- /trunk/phase3/skins/common/mwsuggest.js (modified) (history)
|
| Index: trunk/phase3/skins/common/mwsuggest.js |
| — | — | @@ -7,6 +7,12 @@ |
| 8 | 8 | * by Robert Stojnic (April 2008) |
| 9 | 9 | */ |
| 10 | 10 | |
| | 11 | +// Make sure wgMWSuggestTemplate is defined |
| | 12 | +if ( !mw.config.exists( 'wgMWSuggestTemplate' ) ) { |
| | 13 | + mw.config.set( 'wgMWSuggestTemplate', mw.config.get( 'wgServer' ) + mw.config.get( 'wgScriptPath' ) |
| | 14 | + + "/api.php?action=opensearch\x26search={searchTerms}\x26namespace={namespaces}\x26suggest" ); |
| | 15 | +} |
| | 16 | + |
| 11 | 17 | // search_box_id -> Results object |
| 12 | 18 | window.os_map = {}; |
| 13 | 19 | // cached data, url -> json_text |
| — | — | @@ -416,7 +422,7 @@ |
| 417 | 423 | var r = os_timer.r; |
| 418 | 424 | var query = os_timer.query; |
| 419 | 425 | os_timer = null; |
| 420 | | - var path = wgMWSuggestTemplate.replace( "{namespaces}", os_getNamespaces( r ) ) |
| | 426 | + var path = mw.config.get( 'wgMWSuggestTemplate' ).replace( "{namespaces}", os_getNamespaces( r ) ) |
| 421 | 427 | .replace( "{dbname}", wgDBname ) |
| 422 | 428 | .replace( "{searchTerms}", os_encodeQuery( query ) ); |
| 423 | 429 | |
Follow-up revisions
| Revision | Commit summary | Author | Date |
|---|
| r82151 | 1.17wmf1: MFT r78964, r79086, r79087, r79091, r82004, r82025, r82048, r82070,... | catrope | 22:55, 14 February 2011 |
| r85151 | MFT: r82000, r82004, r82020, r82025, r82038, r82039, r82048, r82070, r82081, ... | demon | 20:39, 1 April 2011 |
Status & tagging log
- 20:40, 1 April 2011 😂 (talk | contribs) changed the tags for r82025 [removed: 1.17]
- 19:23, 15 February 2011 Krinkle (talk | contribs) changed the tags for r82025 [removed: 1.17wmf1]
- 20:51, 14 February 2011 Catrope (talk | contribs) changed the status of r82025 [removed: new added: ok]
- 20:09, 12 February 2011 Krinkle (talk | contribs) changed the tags for r82025 [added: 1.17,1.17wmf1]
|