[mythweb] Addresses PHP 7.2 issue, fixes #4937.

commit e7dd2134a12ad2d25ceb7f131d90c4819cef46c0 Author: Richard Shaw <hobbes1069(a)gmail.com&gt; Date: Sun Sep 23 07:28:52 2018 -0500 Addresses PHP 7.2 issue, fixes #4937. mythweb-php_fix.patch | 25 +++++++++++++++++++++++++ mythweb.spec | 3 ++- 2 files changed, 27 insertions(+), 1 deletion(-) --- diff --git a/mythweb-php_fix.patch b/mythweb-php_fix.patch new file mode 100644 index 0000000..2d4ca44 --- /dev/null +++ b/mythweb-php_fix.patch @@ -0,0 +1,25 @@ + modules/tv/tmpl/default/detail.php | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/tv/tmpl/default/detail.php b/modules/tv/tmpl/default/detail.php +index f6d1faa9..4975f415 100644 +--- a/modules/tv/tmpl/default/detail.php ++++ b/modules/tv/tmpl/default/detail.php +@@ -842,7 +842,7 @@ + } + echo ' </ul>'; + } +- if (count($program->jobs['queue'])) { ++ if (is_array($program->jobs['queue']) && count($program->jobs['queue'])) { + echo t('Queued jobs'), ':', + ' <ul class="-queued">'; + foreach ($program->jobs['queue'] as $job) { +@@ -856,7 +856,7 @@ + } + echo ' </ul>'; + } +- if (count($program->jobs['done'])) { ++ if (is_array($program->jobs['done']) && count($program->jobs['done'])) { + echo t('Recently completed jobs'), ':', + ' <ul class="-done">'; + foreach ($program->jobs['done'] as $job) { diff --git a/mythweb.spec b/mythweb.spec index c20deee..02591a0 100644 --- a/mythweb.spec +++ b/mythweb.spec @@ -16,6 +16,7 @@ Source2: ChangeLog # Patch generated from mythweb fixes branch. From mythweb git directory: # git diff -p --stat <git_tag> > mythweb-fixes.patch Patch0: mythweb-fixes.patch +Patch1: mythweb-php_fix.patch # This is needed for perl dependency auto-detection BuildRequires: perl-generators @@ -75,7 +76,7 @@ rm %{buildroot}%{_datadir}/mythweb/{LICENSE,README,INSTALL,ChangeLog} %changelog -* Mon Sep 10 2018 Richard Shaw <hobbes1069(a)gmail.com&gt; - 29.1-4 +* Sun Sep 23 2018 Richard Shaw <hobbes1069(a)gmail.com&gt; - 29.1-4 - Addresses PHP 7.2 issue, fixes #4937. * Fri Jul 27 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 29.1-3