Skip to content

Commit

Permalink
Revert "Update settings loading"
Browse files Browse the repository at this point in the history
This reverts commit b375f05.
  • Loading branch information
JeroenDeDauw committed Dec 16, 2018
1 parent e3f64b0 commit ec3dc57
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 7 deletions.
6 changes: 1 addition & 5 deletions MapsRegistration.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@ public static function onRegistration( array $credits ) {
}

if ( !defined( 'Maps_SETTINGS_LOADED' ) ) {
foreach ( include __DIR__ . '/DefaultSettings.php' as $key => $value ) {
$GLOBALS[$key] = $value;
}

define( 'Maps_SETTINGS_LOADED', true );
require_once __DIR__ . '/Maps_Settings.php';
}

if ( is_readable( __DIR__ . '/vendor/autoload.php' ) ) {
Expand Down
17 changes: 15 additions & 2 deletions Maps_Settings.php
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
<?php

// If you are looking for the default settings of the Maps extension,
// please see the DefaultSettings.php file.
/**
* For instructions on how to configure Maps, see
* https://www.semantic-mediawiki.org/wiki/Maps/Configuration
*
* For a list of all available settings and their default values,
* see DefaultSettings.php in this directory.
*/

foreach ( include __DIR__ . '/DefaultSettings.php' as $key => $value ) {
$GLOBALS[$key] = $value;
}

if ( !defined( 'Maps_SETTINGS_LOADED' ) ) {
define( 'Maps_SETTINGS_LOADED', true );
}

0 comments on commit ec3dc57

Please sign in to comment.