Author: glen Date: Sun Dec 5 20:34:10 2010 GMT Module: packages Tag: HEAD ---- Log message: - reset error state when fetching next calendar
---- Files affected: packages/dokuwiki-plugin-icalevents: dokuwiki-plugin-icalevents.spec (1.2 -> 1.3) , reset-error.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/dokuwiki-plugin-icalevents/dokuwiki-plugin-icalevents.spec diff -u packages/dokuwiki-plugin-icalevents/dokuwiki-plugin-icalevents.spec:1.2 packages/dokuwiki-plugin-icalevents/dokuwiki-plugin-icalevents.spec:1.3 --- packages/dokuwiki-plugin-icalevents/dokuwiki-plugin-icalevents.spec:1.2 Sun Dec 5 21:30:03 2010 +++ packages/dokuwiki-plugin-icalevents/dokuwiki-plugin-icalevents.spec Sun Dec 5 21:34:04 2010 @@ -5,14 +5,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} @@ -36,6 +37,7 @@ mv iCalEvents/* . %undos -f php %patch0 -p1 +%patch1 -p1 version=$(awk -F"'" '/date/&&/=>/{print $4}' syntax.php) if [ "$(echo "$version" | tr -d -)" != %{version} ]; then @@ -65,6 +67,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.3 2010/12/05 20:34:04 glen +- reset error state when fetching next calendar + Revision 1.2 2010/12/05 20:30:03 glen - plugin must be in dir with proper caps to work ================================================================ Index: packages/dokuwiki-plugin-icalevents/reset-error.patch diff -u /dev/null packages/dokuwiki-plugin-icalevents/reset-error.patch:1.1 --- /dev/null Sun Dec 5 21:34:10 2010 +++ packages/dokuwiki-plugin-icalevents/reset-error.patch Sun Dec 5 21:34:04 2010 @@ -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; ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dokuwiki-plugin-icalevents/dokuwiki-plugin-icalevents.spec?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
