- reset error state when fetching next calendar

Changed files:
    dokuwiki-plugin-icalevents.spec -> 1.3
    reset-error.patch -> 1.1

diff --git a/dokuwiki-plugin-icalevents.spec b/dokuwiki-plugin-icalevents.spec
index aa8722bacb982f4f7e7e00de30c52c97cb0ec8f0..900e38fee355f7e64a293266e5a9ae4583768e26 100644 (file)
--- a/dokuwiki-plugin-icalevents.spec
+++ b/dokuwiki-plugin-icalevents.spec
@@ -4,14 +4,15 @@
 Summary:       Parses an iCal calendar .ics file and renders it as an HTML table
 Name:          dokuwiki-plugin-icalevents
 Version:       20100501
-Release:       0.5
+Release:       0.6
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://public.doogie.de/projects/dokuwiki/plugin_iCalEvents_2.0.zip
 # Source0-md5: abef6798132ba03b74afd72ea62678ca
 URL:           http://www.dokuwiki.org/plugin:icalevents
-BuildRequires: rpm-php-pearprov >= 4.4.2-11
 Patch0:                dformat.patch
+Patch1:                reset-error.patch
+BuildRequires: rpm-php-pearprov >= 4.4.2-11
 BuildRequires: rpmbuild(macros) >= 1.553
 Requires:      dokuwiki >= 20080505
 Requires:      php-common >= 4:%{php_min_version}
@@ -35,6 +36,7 @@ and display upcoming events as an HTML table.
 mv iCalEvents/* .
 %undos -f php
 %patch0 -p1
+%patch1 -p1
 
 version=$(awk -F"'" '/date/&&/=>/{print $4}' syntax.php)
 if [ "$(echo "$version" | tr -d -)" != %{version} ]; then

diff --git a/reset-error.patch b/reset-error.patch
new file mode 100644 (file)
index 0000000..f164b84
--- /dev/null
+++ b/reset-error.patch
@@ -0,0 +1,14 @@
+--- iCalEvents/syntax.php~     2010-12-05 22:32:32.000000000 +0200
++++ iCalEvents/syntax.php      2010-12-05 22:32:57.535271298 +0200
+@@ -132,7 +132,10 @@
+      */
+     function _parseIcs($url, $from, $previewSec) {
+           global $conf;
+-      
++
++        // must reset error in case we have multiple calendars on page
++        $this->error = false;
++
+         $http    = new DokuHTTPClient();
+         if (!$http->get($url)) {
+           $this->error = "Could not get '$url': ".$http->status;