From 2fafa721571ea64f75d57485a0ff836d8a6c337a Mon Sep 17 00:00:00 2001 From: Ian Date: Wed, 22 Aug 2012 20:41:58 +0200 Subject: [PATCH] fixed github preview image path --- .../serendipity_event_spartacus.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php b/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php index 7f0a183b..ebd9ab8c 100644 --- a/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php +++ b/plugins/serendipity_event_spartacus/serendipity_event_spartacus.php @@ -798,6 +798,7 @@ class serendipity_event_spartacus extends serendipity_event function &buildTemplateList(&$tree) { $pluginstack = array(); $i = 0; + $gitloc = ''; $mirrors = $this->getMirrors('files', true); $mirror = $mirrors[$this->get_config('mirror_files', 0)]; @@ -808,6 +809,10 @@ class serendipity_event_spartacus extends serendipity_event $mirror = $servers[0]; } + if (stristr($mirror, 'github.com')) { + $gitloc = 'master/'; + } + $this->checkArray($tree); foreach($tree[0]['children'] AS $idx => $subtree) { @@ -825,7 +830,7 @@ class serendipity_event_spartacus extends serendipity_event break; case 'template': - $pluginstack[$i]['template'] = $childtree['value']; + $pluginstack[$i]['template'] = $childtree['value']; break; case 'description': @@ -862,13 +867,13 @@ class serendipity_event_spartacus extends serendipity_event } $plugname = $pluginstack[$i]['template']; - $pluginstack[$i]['previewURL'] = $mirror . '/additional_themes/' . $plugname . '/preview.png?revision=1.9999'; - $pluginstack[$i]['preview_fullsizeURL'] = $mirror . '/additional_themes/' . $plugname . '/preview_fullsize.jpg?revision=1.9999'; + $pluginstack[$i]['previewURL'] = $mirror . '/additional_themes/' . $gitloc . $plugname . '/preview.png?revision=1.9999'; + $pluginstack[$i]['preview_fullsizeURL'] = $mirror . '/additional_themes/' . $gitloc . $plugname . '/preview_fullsize.jpg?revision=1.9999'; $pluginstack[$i]['customURI'] = '&serendipity[spartacus_fetch]=' . $plugname; $pluginstack[$i]['customIcon'] = '_spartacus'; - // Remove the temporary $i reference, as the array should be associative - $pluginstack[$plugname] = $pluginstack[$i]; + // Remove the temporary $i reference, as the array should be associative and fix double slashes in url string + $pluginstack[$plugname] = str_replace('//', '/', $pluginstack[$i]); unset($pluginstack[$i]); } }