initial update to v31

1 files changed, 0 insertions, 41 deletions

diff --git a/001-mythwebcount.patch b/001-mythwebcount.patch
deleted file mode 100644
index 336c6817446b..000000000000
--- a/001-mythwebcount.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/modules/tv/classes/Schedule.php b/modules/tv/classes/Schedule.php
-index c63f9483..1814d6e2 100644
---- a/modules/tv/classes/Schedule.php
-+++ b/modules/tv/classes/Schedule.php
-@@ -103,7 +103,9 @@ class Schedule extends MythBase {
-     public static function findAll($sort = true) {
-         global $db;
-         $orderby = '';
--        if ($sort && count($_SESSION['schedules_sortby'])) {
-+        if ($_SESSION['schedules_sortby']) $schedule_sort = count($_SESSION['schedules_sortby']);
-+        else $schedule_sort = 0;
-+        if ($sort && $schedule_sort) {
-             $orderby = 'ORDER BY ';
-             foreach ($_SESSION['schedules_sortby'] AS $key => $sort) {
-                 if ($key > 0)
-diff --git a/modules/tv/tmpl/default/detail.php b/modules/tv/tmpl/default/detail.php
-index f6d1faa9..4a4ee5e1 100644
---- a/modules/tv/tmpl/default/detail.php
-+++ b/modules/tv/tmpl/default/detail.php
-@@ -842,7 +842,9 @@
-             }
-             echo '            </ul>';
-         }
--        if (count($program->jobs['queue'])) {
-+        if ($program->jobs['queue']) $jobcount = (count($program->jobs['queue']));
-+        else $jobcount = 0;
-+        if ($jobcount) {
-             echo t('Queued jobs'), ':',
-                  '            <ul class="-queued">';
-             foreach ($program->jobs['queue'] as $job) {
-@@ -856,7 +858,9 @@
-             }
-             echo '            </ul>';
-         }
--        if (count($program->jobs['done'])) {
-+        if ($program->jobs['done']) $jobsdone = count($program->jobs['done']);
-+        else $jobsdone = 0;
-+        if ($jobsdone) {
-             echo t('Recently completed jobs'), ':',
-                  '            <ul class="-done">';
-             foreach ($program->jobs['done'] as $job) {