| Index: branches/wmf-deployment/skins/common/mwsuggest.js |
| — | — | @@ -840,6 +840,11 @@ |
| 841 | 841 | // remove descriptor |
| 842 | 842 | os_map[inputId] = null; |
| 843 | 843 | } |
| | 844 | + |
| | 845 | + // Remove the element from the os_autoload_* arrays |
| | 846 | + var index = os_autoload_inputs.indexOf(inputId); |
| | 847 | + if ( index >= 0 ) |
| | 848 | + os_autoload_inputs[index] = os_autoload_forms[index] = ''; |
| 844 | 849 | } |
| 845 | 850 | |
| 846 | 851 | /** Initialization, call upon page onload */ |
| Index: branches/wmf-deployment/includes/parser/Parser.php |
| — | — | @@ -2298,7 +2298,8 @@ |
| 2299 | 2299 | * @private |
| 2300 | 2300 | */ |
| 2301 | 2301 | function getVariableValue( $index, $frame=false ) { |
| 2302 | | - global $wgContLang, $wgSitename, $wgServer, $wgServerName, $wgScriptPath; |
| | 2302 | + global $wgContLang, $wgSitename, $wgServer, $wgServerName; |
| | 2303 | + global $wgScriptPath, $wgStylePath; |
| 2303 | 2304 | |
| 2304 | 2305 | /** |
| 2305 | 2306 | * Some of these require message or data lookups and can be |
| — | — | @@ -2513,6 +2514,8 @@ |
| 2514 | 2515 | return $wgServerName; |
| 2515 | 2516 | case 'scriptpath': |
| 2516 | 2517 | return $wgScriptPath; |
| | 2518 | + case 'stylepath': |
| | 2519 | + return $wgStylePath; |
| 2517 | 2520 | case 'directionmark': |
| 2518 | 2521 | return $wgContLang->getDirMark(); |
| 2519 | 2522 | case 'contentlanguage': |
| Index: branches/wmf-deployment/includes/MagicWord.php |
| — | — | @@ -64,6 +64,7 @@ |
| 65 | 65 | 'server', |
| 66 | 66 | 'servername', |
| 67 | 67 | 'scriptpath', |
| | 68 | + 'stylepath', |
| 68 | 69 | 'pagename', |
| 69 | 70 | 'pagenamee', |
| 70 | 71 | 'fullpagename', |
| Index: branches/wmf-deployment/includes/DefaultSettings.php |
| — | — | @@ -1588,7 +1588,7 @@ |
| 1589 | 1589 | * to ensure that client-side caches do not keep obsolete copies of global |
| 1590 | 1590 | * styles. |
| 1591 | 1591 | */ |
| 1592 | | -$wgStyleVersion = '239a'; |
| | 1592 | +$wgStyleVersion = '240'; |
| 1593 | 1593 | |
| 1594 | 1594 | |
| 1595 | 1595 | # Server-side caching: |
| Index: branches/wmf-deployment/languages/messages/MessagesEn.php |
| — | — | @@ -297,6 +297,7 @@ |
| 298 | 298 | 'server' => array( 0, 'SERVER' ), |
| 299 | 299 | 'servername' => array( 0, 'SERVERNAME' ), |
| 300 | 300 | 'scriptpath' => array( 0, 'SCRIPTPATH' ), |
| | 301 | + 'stylepath' => array( 0, 'STYLEPATH' ), |
| 301 | 302 | 'grammar' => array( 0, 'GRAMMAR:' ), |
| 302 | 303 | 'gender' => array( 0, 'GENDER:' ), |
| 303 | 304 | 'notitleconvert' => array( 0, '__NOTITLECONVERT__', '__NOTC__'), |