Another fix to Spartacus after dropping netmirror.

See s9y#548. Expands b0fb8d2 by adding the necessary fix at another code point. Fixes a whitespace issue (tabs -> spaces). Add Changelog entries. Needs to be backported to 2.1 after tests and review. Signed-off-by: Thomas Hochstein <thh@inter.net>
th-h · Mar 30, 2018 · e517118 · e517118
1 parent dcb693b
commit e517118
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/plugins/serendipity_event_spartacus/ChangeLog b/plugins/serendipity_event_spartacus/ChangeLog
@@ -1,3 +1,11 @@
+2.37.5:
+-------
+    * Fix missing reset to default after dropping netmirror.
+
+2.37.4:
+-------
+    * Drop netmirror, set mirror to default if it was set to netmirror.
+
 2.37.3:
 -------
     * Change mirror order (new default: github)

diff --git a/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php b/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php
@@ -27,7 +27,7 @@ function introspect(&$propbag)
         $propbag->add('description',   PLUGIN_EVENT_SPARTACUS_DESC);
         $propbag->add('stackable',     false);
         $propbag->add('author',        'Garvin Hicking');
-        $propbag->add('version',       '2.37.4');
+        $propbag->add('version',       '2.37.5');
         $propbag->add('requirements',  array(
             'serendipity' => '1.6',
         ));
@@ -839,6 +839,9 @@ function &buildTemplateList(&$tree)
 
         $mirrors = $this->getMirrors('files', true);
         $mirror  = $mirrors[$this->get_config('mirror_files', 0)];
+        if ($mirror == null) {
+            $mirror = $mirrors[0];
+        }
 
         $custom  = $this->get_config('custommirror');
         if (strlen($custom) > 2) {
@@ -1002,9 +1005,9 @@ function download(&$tree, $plugin_to_install, $sub = 'plugins')
 
         $mirrors = $this->getMirrors('files', true);
         $mirror  = $mirrors[$this->get_config('mirror_files', 0)];
-	if ($mirror == null) {
-		$mirror = $mirrors[0];
-	}
+        if ($mirror == null) {
+            $mirror = $mirrors[0];
+        }
         $custom  = $this->get_config('custommirror');
         if (strlen($custom) > 2) {
             $servers = explode('|', $custom);