| Index: trunk/extensions/SemanticMaps/SM_Settings.php |
| — | — | @@ -28,15 +28,13 @@ |
| 29 | 29 | $egMapsAvailableFeatures['qp'] = array( |
| 30 | 30 | 'name' => 'Query Printer', |
| 31 | 31 | 'class' => 'SMQueryPrinters', |
| 32 | | - 'file' => 'SemanticMaps/QueryPrinters/SM_QueryPrinters.php', |
| 33 | | - 'local' => false |
| | 32 | + 'file' => 'SemanticMaps/QueryPrinters/SM_QueryPrinters.php' |
| 34 | 33 | ); |
| 35 | 34 | |
| 36 | 35 | $egMapsAvailableFeatures['fi'] = array( |
| 37 | 36 | 'name' => 'Form input', |
| 38 | 37 | 'class' => 'SMFormInputs', |
| 39 | | - 'file' => 'SemanticMaps/FormInputs/SM_FormInputs.php', |
| 40 | | - 'local' => false |
| | 38 | + 'file' => 'SemanticMaps/FormInputs/SM_FormInputs.php' |
| 41 | 39 | ); |
| 42 | 40 | |
| 43 | 41 | |
| — | — | @@ -59,5 +57,5 @@ |
| 60 | 58 | # Array of String. The default mapping service for each feature, which will be used when no valid service is provided by the user. |
| 61 | 59 | # Each service needs to be enabled, if not, the first one from the available services will be taken. |
| 62 | 60 | # Note: The default service needs to be available for the feature you set it for, since it's used as a fallback mechanism. |
| 63 | | -$egMapsDefaultServices['qp'] = 'googlemaps'; |
| 64 | | -$egMapsDefaultServices['fi'] = 'googlemaps'; |
| | 61 | +$egMapsDefaultServices['qp'] = 'googlemaps2'; |
| | 62 | +$egMapsDefaultServices['fi'] = 'googlemaps2'; |
| Index: trunk/extensions/SemanticMaps/QueryPrinters/SM_QueryPrinters.php |
| — | — | @@ -135,7 +135,7 @@ |
| 136 | 136 | |
| 137 | 137 | // Load the QP class when it's not loaded yet |
| 138 | 138 | if (! array_key_exists($qp['class'], $wgAutoloadClasses)) { |
| 139 | | - $file = $qp['local'] ? $smgIP . '/' . $qp['file'] : $qp['file']; |
| | 139 | + $file = array_key_exists('local', $qp) && $qp['local'] ? $smgIP . '/' . $qp['file'] : $qp['file']; |
| 140 | 140 | $wgAutoloadClasses[$qp['class']] = $file; |
| 141 | 141 | } |
| 142 | 142 | |
| Index: trunk/extensions/SemanticMaps/GoogleMaps/SM_GoogleMaps.php |
| — | — | @@ -20,5 +20,5 @@ |
| 21 | 21 | die( 'Not an entry point.' ); |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | | -$egMapsServices['googlemaps']['qp'] = array('class' => 'SMGoogleMapsQP', 'file' => 'GoogleMaps/SM_GoogleMapsQP.php', 'local' => true); |
| 25 | | -$egMapsServices['googlemaps']['fi'] = array('class' => 'SMGoogleMapsFormInput', 'file' => 'GoogleMaps/SM_GoogleMapsFormInput.php', 'local' => true); |
| \ No newline at end of file |
| | 24 | +$egMapsServices['googlemaps2']['qp'] = array('class' => 'SMGoogleMapsQP', 'file' => 'GoogleMaps/SM_GoogleMapsQP.php', 'local' => true); |
| | 25 | +$egMapsServices['googlemaps2']['fi'] = array('class' => 'SMGoogleMapsFormInput', 'file' => 'GoogleMaps/SM_GoogleMapsFormInput.php', 'local' => true); |
| \ No newline at end of file |