Author: hobbes1069 Update of /cvs/free/rpms/mythweb/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23131 Modified Files: mythweb.spec Added Files: mythweb-php54.patch Log Message: * Fri Jul 06 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.25.1-3 - Patch for PHP 5.4 warnings. mythweb-php54.patch: includes/sorting.php | 2 +- modules/tv/schedules.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) --- NEW FILE mythweb-php54.patch --- includes/sorting.php | 2 +- modules/tv/schedules.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/includes/sorting.php b/includes/sorting.php index f89fab8..4720610 100644 --- a/includes/sorting.php +++ b/includes/sorting.php @@ -119,7 +119,7 @@ function by_user_choice(&$a, &$b) { foreach ($GLOBALS['user_sort_choice'] as $sort) { $function = 'by_'.$sort['field']; - $response = $function(&$a, &$b); + $response = $function($a, $b); // Identical response, go on to the next sort choice if (!$response) continue; diff --git a/modules/tv/schedules.php b/modules/tv/schedules.php index d09095f..c3c0f13 100644 --- a/modules/tv/schedules.php +++ b/modules/tv/schedules.php @@ -36,6 +36,10 @@ $schedule->profile = ''; $schedule->recgroup = ''; } + // Add a blank channel, to suppress warnings + if (!$schedule->channel) { + $schedule->channel = Channel::find(null); + } // Add this show $the_schedules[] = &$schedule; } Index: mythweb.spec =================================================================== RCS file: /cvs/free/rpms/mythweb/devel/mythweb.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mythweb.spec 5 Jul 2012 16:19:07 -0000 1.1 +++ mythweb.spec 7 Jul 2012 02:56:49 -0000 1.2 @@ -10,7 +10,7 @@ Group: Applications/Multimedia Version: 0.25.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and LGPLv2 and MIT @@ -21,7 +21,10 @@ # Patch generated from mythweb fixes branch. From mythweb git directory: # git diff -p --stat %{version} > mythweb-fixes.patch -Patch1: mythweb-fixes.patch +Patch0: mythweb-fixes.patch + +# Needed for PHP 5.4 +Patch1: mythweb-php54.patch # The following are required only in mythweb is running on the same computer # as the backend. They will be pulled in by the mythtv meta package anyway. @@ -43,7 +46,7 @@ %prep %setup -q -n MythTV-mythweb-%{githash2} -#patch1 -p1 -b .mythweb +%patch1 -p1 -b .php54 # Fix directory permissions #find ./ -type d -exec chmod 0755 {} \; @@ -71,10 +74,14 @@ %files %doc README LICENSE ChangeLog %config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf +%defattr(-,apache,apache,0755) %{_datadir}/mythweb/ %changelog +* Fri Jul 06 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.25.1-3 +- Patch for PHP 5.4 warnings. + * Sun Jul 01 2012 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.25.1-2 - Lots of tweaks per review request: https://bugzilla.rpmfusion.org/show_bug.cgi?id=2366