From 16c7f89b243a0d6b94ece84306360b2b1e54d7eb Mon Sep 17 00:00:00 2001
From: George Nassas <George+Development@Nassas.com>
Date: Thu, 5 Jun 2014 13:25:46 -0400
Subject: [PATCH] Update
---
.gitignore | 1 +
modules/tv/classes/Program.php | 10 ++++------
modules/tv/tmpl/default/detail.php | 6 ++++++
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index fec704b..75b27bd 100644
a
|
b
|
|
| 1 | *~ |
1 | 2 | .ht* |
2 | 3 | *.orig |
3 | 4 | .*.swp |
diff --git a/modules/tv/classes/Program.php b/modules/tv/classes/Program.php
index 3573e9b..7a3a727 100644
a
|
b
|
class Program extends MythBase { |
210 | 210 | elseif ($frac >= .25) |
211 | 211 | $this->starstring .= '¼'; |
212 | 212 | // Get the name of the input |
213 | | if ($this->inputid) { |
214 | | $this->inputname = $db->query_col('SELECT displayname |
215 | | FROM cardinput |
216 | | WHERE cardinputid=?', |
217 | | $this->inputid); |
218 | | } |
| 213 | $this->inputname = $db->query_col('SELECT inputname |
| 214 | FROM recorded |
| 215 | WHERE recordedid=?', |
| 216 | $this->recordedid); |
219 | 217 | // Turn recstatus into a word |
220 | 218 | if (isset($this->recstatus) && $GLOBALS['RecStatus_Types'][$this->recstatus]) { |
221 | 219 | $this->recstatus_orig = $this->recstatus; |
diff --git a/modules/tv/tmpl/default/detail.php b/modules/tv/tmpl/default/detail.php
index 1997c82..785694a 100644
a
|
b
|
|
391 | 391 | <td><?php echo nice_filesize($program->filesize) ?></td> |
392 | 392 | </tr><?php |
393 | 393 | } |
| 394 | if ($program->inputname) { |
| 395 | ?><tr class="x-extras"> |
| 396 | <th><?php echo t('Input Name') ?>:</th> |
| 397 | <td><?php echo $program->inputname ?></td> |
| 398 | </tr><?php |
| 399 | } |
394 | 400 | if (strlen($program->recgroup)) { |
395 | 401 | ?><tr class="x-extras"> |
396 | 402 | <th><?php echo t('Recording Group') ?>:</th> |