| Index: trunk/extensions/SemanticMaps/YahooMaps/SM_YahooMapsFormInput.php |
| — | — | @@ -35,18 +35,17 @@ |
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * @see MapsMapFeature::addFormDependencies() |
| 39 | | - * |
| 40 | | - * @param string $output |
| | 39 | + * |
| 41 | 40 | */ |
| 42 | | - protected function addFormDependencies(&$output) { |
| | 41 | + protected function addFormDependencies() { |
| 43 | 42 | global $wgJsMimeType; |
| 44 | 43 | global $smgIncludePath, $smgYahooFormsOnThisPage; |
| 45 | 44 | |
| 46 | | - MapsYahooMapsUtils::addYMapDependencies($output); |
| | 45 | + MapsYahooMapsUtils::addYMapDependencies($this->output); |
| 47 | 46 | |
| 48 | 47 | if (empty($smgYahooFormsOnThisPage)) { |
| 49 | 48 | $smgYahooFormsOnThisPage = 0; |
| 50 | | - $output .= "<script type='$wgJsMimeType' src='$smgIncludePath/YahooMaps/SM_YahooMapsFunctions.js'></script>"; |
| | 49 | + $this->output .= "<script type='$wgJsMimeType' src='$smgIncludePath/YahooMaps/SM_YahooMapsFunctions.js'></script>"; |
| 51 | 50 | } |
| 52 | 51 | } |
| 53 | 52 | |
| — | — | @@ -57,7 +56,7 @@ |
| 58 | 57 | protected function doMapServiceLoad() { |
| 59 | 58 | global $egYahooMapsOnThisPage, $smgYahooFormsOnThisPage; |
| 60 | 59 | |
| 61 | | - self::addFormDependencies($this->output); |
| | 60 | + self::addFormDependencies(); |
| 62 | 61 | |
| 63 | 62 | $egYahooMapsOnThisPage++; |
| 64 | 63 | $smgYahooFormsOnThisPage++; |
| Index: trunk/extensions/SemanticMaps/OpenLayers/SM_OpenLayersFormInput.php |
| — | — | @@ -35,18 +35,17 @@ |
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * @see MapsMapFeature::addFormDependencies() |
| 39 | | - * |
| 40 | | - * @param string $output |
| | 39 | + * |
| 41 | 40 | */ |
| 42 | | - protected function addFormDependencies(&$output) { |
| | 41 | + protected function addFormDependencies() { |
| 43 | 42 | global $wgJsMimeType; |
| 44 | 43 | global $smgIncludePath, $smgOLFormsOnThisPage; |
| 45 | 44 | |
| 46 | | - MapsOpenLayersUtils::addOLDependencies($output); |
| | 45 | + MapsOpenLayersUtils::addOLDependencies($this->output); |
| 47 | 46 | |
| 48 | 47 | if (empty($smgOLFormsOnThisPage)) { |
| 49 | 48 | $smgOLFormsOnThisPage = 0; |
| 50 | | - $output .= "<script type='$wgJsMimeType' src='$smgIncludePath/OpenLayers/SM_OpenLayersFunctions.js'></script>"; |
| | 49 | + $this->output .= "<script type='$wgJsMimeType' src='$smgIncludePath/OpenLayers/SM_OpenLayersFunctions.js'></script>"; |
| 51 | 50 | } |
| 52 | 51 | } |
| 53 | 52 | |
| — | — | @@ -57,7 +56,7 @@ |
| 58 | 57 | protected function doMapServiceLoad() { |
| 59 | 58 | global $egOpenLayersOnThisPage, $smgOLFormsOnThisPage; |
| 60 | 59 | |
| 61 | | - self::addFormDependencies($this->output); |
| | 60 | + self::addFormDependencies(); |
| 62 | 61 | |
| 63 | 62 | $egOpenLayersOnThisPage++; |
| 64 | 63 | $smgOLFormsOnThisPage++; |
| Index: trunk/extensions/SemanticMaps/SemanticMaps.php |
| — | — | @@ -29,6 +29,9 @@ |
| 30 | 30 | $smgIP = $IP . '/extensions/SemanticMaps'; |
| 31 | 31 | $smgIncludePath = $wgServer . $smgScriptPath; |
| 32 | 32 | |
| | 33 | +// Include the settings file |
| | 34 | +require_once($smgIP . '/SM_Settings.php'); |
| | 35 | + |
| 33 | 36 | // Add the extensions initializing function |
| 34 | 37 | if ( defined( 'MW_SUPPORTS_PARSERFIRSTCALLINIT' ) ) { |
| 35 | 38 | $wgHooks['ParserFirstCallInit'][] = 'smfSetup'; |
| — | — | @@ -60,12 +63,12 @@ |
| 61 | 64 | * |
| 62 | 65 | */ |
| 63 | 66 | function smfSetup() { |
| 64 | | - global $wgExtensionCredits, $egMapsServices; |
| | 67 | + global $wgExtensionCredits, $wgLang, $egMapsServices, $sfgFormPrinter; |
| 65 | 68 | |
| 66 | 69 | // Creation of a list of internationalized service names |
| 67 | 70 | $services = array(); |
| 68 | 71 | foreach (array_keys($egMapsServices) as $name) $services[] = wfMsg('maps_'.$name); |
| 69 | | - $services_list = implode(', ', $services); |
| | 72 | + $services_list = $wgLang->listToText($services); |
| 70 | 73 | |
| 71 | 74 | wfLoadExtensionMessages( 'SemanticMaps' ); |
| 72 | 75 | |
| Index: trunk/extensions/SemanticMaps/GoogleMaps/SM_GoogleMapsFormInput.php |
| — | — | @@ -38,17 +38,16 @@ |
| 39 | 39 | /** |
| 40 | 40 | * @see MapsMapFeature::addFormDependencies() |
| 41 | 41 | * |
| 42 | | - * @param string $output |
| 43 | 42 | */ |
| 44 | | - protected function addFormDependencies(&$output) { |
| | 43 | + protected function addFormDependencies() { |
| 45 | 44 | global $wgJsMimeType; |
| 46 | 45 | global $smgIncludePath, $smgGoogleFormsOnThisPage; |
| 47 | 46 | |
| 48 | | - MapsGoogleMapsUtils::addGMapDependencies($output); |
| | 47 | + MapsGoogleMapsUtils::addGMapDependencies($this->output); |
| 49 | 48 | |
| 50 | 49 | if (empty($smgGoogleFormsOnThisPage)) { |
| 51 | 50 | $smgGoogleFormsOnThisPage = 0; |
| 52 | | - $output .= "<script type='$wgJsMimeType' src='$smgIncludePath/GoogleMaps/SM_GoogleMapFunctions.js'></script>"; |
| | 51 | + $this->output .= "<script type='$wgJsMimeType' src='$smgIncludePath/GoogleMaps/SM_GoogleMapsFunctions.js'></script>"; |
| 53 | 52 | } |
| 54 | 53 | } |
| 55 | 54 | |
| — | — | @@ -59,7 +58,7 @@ |
| 60 | 59 | protected function doMapServiceLoad() { |
| 61 | 60 | global $egGoogleMapsOnThisPage, $smgGoogleFormsOnThisPage; |
| 62 | 61 | |
| 63 | | - self::addFormDependencies($this->output); |
| | 62 | + self::addFormDependencies(); |
| 64 | 63 | |
| 65 | 64 | $egGoogleMapsOnThisPage++; |
| 66 | 65 | $smgGoogleFormsOnThisPage++; |