mbirth/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Another fix to Spartacus after dropping netmirror.

Browse Source 
See #548.

Expands b0fb8d2d12
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>
This commit is contained in:
Thomas Hochstein
2018-03-30 12:38:21 +02:00
committed by onli
parent dcb693ba54
commit 02b70e2266
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/serendipity_event_spartacus/ChangeLog
View File

@@ -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: 2.37.3:
------- -------
* Change mirror order (new default: github) * Change mirror order (new default: github)

11
plugins/serendipity_event_spartacus/serendipity_event_spartacus.php
View File

@@ -27,7 +27,7 @@ class serendipity_event_spartacus extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_SPARTACUS_DESC); $propbag->add('description', PLUGIN_EVENT_SPARTACUS_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Garvin Hicking'); $propbag->add('author', 'Garvin Hicking');
$propbag->add('version', '2.37.4'); $propbag->add('version', '2.37.5');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '1.6', 'serendipity' => '1.6',
)); ));
@@ -839,6 +839,9 @@ class serendipity_event_spartacus extends serendipity_event
$mirrors = $this->getMirrors('files', true); $mirrors = $this->getMirrors('files', true);
$mirror = $mirrors[$this->get_config('mirror_files', 0)]; $mirror = $mirrors[$this->get_config('mirror_files', 0)];
if ($mirror == null) {
$mirror = $mirrors[0];
}
$custom = $this->get_config('custommirror'); $custom = $this->get_config('custommirror');
if (strlen($custom) > 2) { if (strlen($custom) > 2) {
@@ -1002,9 +1005,9 @@ class serendipity_event_spartacus extends serendipity_event
$mirrors = $this->getMirrors('files', true); $mirrors = $this->getMirrors('files', true);
$mirror = $mirrors[$this->get_config('mirror_files', 0)]; $mirror = $mirrors[$this->get_config('mirror_files', 0)];
if ($mirror == null) { if ($mirror == null) {
$mirror = $mirrors[0]; $mirror = $mirrors[0];
} }
$custom = $this->get_config('custommirror'); $custom = $this->get_config('custommirror');
if (strlen($custom) > 2) { if (strlen($custom) > 2) {
$servers = explode('|', $custom); $servers = explode('|', $custom);