| Index: branches/Maps0.8/Maps.php |
| — | — | @@ -116,15 +116,8 @@ |
| 117 | 117 | $wgAutoloadClasses['MapsGeocode'] = $phDir . 'Maps_Geocode.php'; |
| 118 | 118 | $wgAutoloadClasses['MapsGeodistance'] = $phDir . 'Maps_Geodistance.php'; |
| 119 | 119 | |
| 120 | | - // To ensure Maps remains compatible with pre 1.16. |
| 121 | | - if ( !class_exists( 'Html' ) ) { |
| 122 | | - $wgAutoloadClasses['Html'] = $egMapsDir . 'compat/Html.php'; |
| 123 | | - } |
| | 120 | + $wgExtensionMessagesFiles['MapsMagic'] = $egMapsDir . 'Maps.i18n.magic.php'; |
| 124 | 121 | |
| 125 | | - if ( version_compare( $wgVersion, '1.16alpha', '>=' ) ) { |
| 126 | | - $wgExtensionMessagesFiles['MapsMagic'] = $egMapsDir . 'Maps.i18n.magic.php'; |
| 127 | | - } |
| 128 | | - |
| 129 | 122 | $wgExtensionMessagesFiles['Maps'] = $egMapsDir . 'Maps.i18n.php'; |
| 130 | 123 | |
| 131 | 124 | // Register the initialization function of Maps. |
| — | — | @@ -164,12 +157,6 @@ |
| 165 | 158 | function efMapsSetup() { |
| 166 | 159 | global $wgExtensionCredits, $wgLang, $wgExtraNamespaces, $wgNamespaceAliases, $wgVersion; |
| 167 | 160 | |
| 168 | | - // This function has been deprecated in 1.16, but needed for earlier versions. |
| 169 | | - // It's present in 1.16 as a stub, but lets check if it exists in case it gets removed at some point. |
| 170 | | - if ( version_compare( $wgVersion, '1.15', '<=' ) ) { |
| 171 | | - wfLoadExtensionMessages( 'Maps' ); |
| 172 | | - } |
| 173 | | - |
| 174 | 161 | if ( is_null( $wgExtraNamespaces ) ) { |
| 175 | 162 | $wgExtraNamespaces = array(); |
| 176 | 163 | } |