Skip to content

Commit 70dbdbd

Browse files
authored
spartacus 2.39.4: Remove sourceforge from mirror list (#949)
* spartacus 2.39.4: Remove sourceforge from mirror list Fixes #948 * minor: changelog version typo
1 parent f20b675 commit 70dbdbd

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

docs/NEWS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
Version 2.6-beta2 ()
22
------------------------------------------------------------------------
33

4+
* Removed Sourceforge from Spartacus' mirror list, as it caused HTML
5+
to be written to the plugin files instead of the wanted PHP code.
6+
47
* Removed obsolete Pragma header from some responses, controlling
58
brwoser cache behaviour. Alternative headers were already set.
69

plugins/serendipity_event_spartacus/ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2.39.4
2+
-------
3+
* Fix: Sourceforge set as mirror caused HTML files being written to disk instead of the plugin
4+
files when installing or updating plugins. Sourceforge has been removed.
5+
16
2.39.3
27
-------
38
* PHP8.2 compatibility

plugins/serendipity_event_spartacus/serendipity_event_spartacus.php

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function introspect(&$propbag)
2727
$propbag->add('description', PLUGIN_EVENT_SPARTACUS_DESC);
2828
$propbag->add('stackable', false);
2929
$propbag->add('author', 'Garvin Hicking');
30-
$propbag->add('version', '2.39.3');
30+
$propbag->add('version', '2.39.4');
3131
$propbag->add('requirements', array(
3232
'serendipity' => '1.6',
3333
));
@@ -64,10 +64,6 @@ function introspect(&$propbag)
6464
'url' => 'http://www.s9y.org',
6565
'desc' => 'Package server for plugin downloads'
6666
),
67-
'sourceforge.net' => array(
68-
'url' => 'http://www.sourceforget.net',
69-
'desc' => 'Package server for plugin downloads'
70-
),
7167
'gitlab.com' => array(
7268
'url' => 'http://www.gitlab.com',
7369
'desc' => 'Package server for plugin downloads'
@@ -126,7 +122,6 @@ function &getMirrors($type = 'xml', $loc = false)
126122

127123
'files' => array(
128124
'github.com',
129-
'SourceForge.net',
130125
's9y.org',
131126
'gitlab.com'
132127
)
@@ -141,13 +136,11 @@ function &getMirrors($type = 'xml', $loc = false)
141136

142137
'files' => array(
143138
'https://raw.github.com/s9y/',
144-
'http://php-blog.cvs.sourceforge.net/viewvc/php-blog/',
145139
'http://s9y.org/mirror/',
146140
'https://gitlab.com/s9y_blog/'
147141
),
148142

149143
'files_health' => array(
150-
'http://php-blog.cvs.sourceforge.net/' => 'http://php-blog.cvs.sourceforge.net/viewvc/php-blog/serendipity/docs/LICENSE',
151144
'http://s9y.org/' => 'http://s9y.org/',
152145
'https://raw.github.com/' => 'https://raw.github.com/',
153146
'https://gitlab.com/' => 'https://gitlab.com/',
@@ -894,7 +887,11 @@ function &buildTemplateList(&$tree)
894887
$gitloc = '';
895888

896889
$mirrors = $this->getMirrors('files', true);
897-
$mirror = $mirrors[$this->get_config('mirror_files', 0)];
890+
$mirror_file_index = $this->get_config('mirror_files', 0);
891+
if ($mirror_file_index > 2) {
892+
$mirror_file_index = 0;
893+
}
894+
$mirror = $mirrors[$mirror_file_index];
898895
if ($mirror == null) {
899896
$mirror = $mirrors[0];
900897
}
@@ -1064,7 +1061,11 @@ function download(&$tree, $plugin_to_install, $sub = 'plugins')
10641061
}
10651062

10661063
$mirrors = $this->getMirrors('files', true);
1067-
$mirror = $mirrors[$this->get_config('mirror_files', 0)];
1064+
$mirror_file_index = $this->get_config('mirror_files', 0);
1065+
if ($mirror_file_index > 2) {
1066+
$mirror_file_index = 0;
1067+
}
1068+
$mirror = $mirrors[$mirror_file_index];
10681069
if ($mirror == null) {
10691070
$mirror = $mirrors[0];
10701071
}

0 commit comments

Comments
 (0)