Ticket #4628: patch-mythweb.svn

File patch-mythweb.svn, 1.1 KB (added by Yeechang Lee <ylee@…>, 13 years ago)
Line 
1Only in ../mythplugins-0.21/mythweb/includes: config.php~
2Only in ../mythplugins-0.21/mythweb/modules/_shared/lang: English.lang~
3diff -U 2 -r ../mythplugins-0.21.orig/mythweb/modules/tv/upcoming.php ../mythplugins-0.21/mythweb/modules/tv/upcoming.php
4--- ../mythplugins-0.21.orig/mythweb/modules/tv/upcoming.php    2007-12-31 12:38:38.000000000 -0800
5+++ ../mythplugins-0.21/mythweb/modules/tv/upcoming.php 2008-02-09 22:17:03.088486254 -0800
6@@ -74,6 +74,6 @@
7              || $_SESSION['scheduled_recordings']['disp_conflicts'])) {
8         $_SESSION['scheduled_recordings'] = array('disp_scheduled'   => true,
9-                                                  'disp_duplicates'  => true,
10-                                                  'disp_deactivated' => true,
11+                                                  'disp_duplicates'  => false,
12+                                                  'disp_deactivated' => false,
13                                                   'disp_conflicts'   => true
14                                                  );
15Only in ../mythplugins-0.21/mythweb/modules/tv: upcoming.php~