Ticket #11954: recinput.mythweb.v0.28-pre-22-g9811898.patch

File recinput.mythweb.v0.28-pre-22-g9811898.patch, 2.6 KB (added by gnassas@…, 10 years ago)

rebase to reflect recordedid change

  • .gitignore 

    From 72054862f9a9dc764476afa3cd70cdcc995661d2 Mon Sep 17 00:00:00 2001
From: George Nassas <George+Development@Nassas.com>
Date: Tue, 3 Jun 2014 13:27:47 -0400
Subject: [PATCH] Update

---
 .gitignore                     |  5 +++++
 modules/tv/classes/Program.php | 10 +++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index fec704b..d25b5f1 100644
    a b  
     1*~
     2
    13.ht*
    24*.orig
    35.*.swp
     6
     7.project
     8go.php

  • modules/tv/classes/Program.php 

    diff --git a/modules/tv/classes/Program.php b/modules/tv/classes/Program.php
index 3573e9b..b881380 100644
    a b class Program extends MythBase { 
    131131            $this->parttotal       = $data[47];
    132132            $this->category_type   = $data[48];
    133133            $this->recordedid      = $data[49];
     134            $this->inputname       = $data[50];
    134135        // Is this a previously-recorded program?
    135136            if (!empty($this->filename)) {
    136137                $this->url = video_url($this); // get download info
    … … class Program extends MythBase { 
    179180            $this->title_pronounce          = $data['title_pronounce'];
    180181            $this->recstatus                = $data['recstatus'];
    181182            $this->recordedid               = $data['recordedid'];
     183            $this->inputname                = $data['inputname'];
    182184
    183185        // These db fields should really get renamed...
    184186            $this->audioproperties          = $data['stereo'];
    … … class Program extends MythBase { 
    209211            $this->starstring .= '&frac12;';
    210212        elseif ($frac >= .25)
    211213            $this->starstring .= '&frac14;';
    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         }
    219214    // Turn recstatus into a word
    220215        if (isset($this->recstatus) && $GLOBALS['RecStatus_Types'][$this->recstatus]) {
    221216            $this->recstatus_orig   = $this->recstatus;
    … … class Program extends MythBase { 
    396391                             $this->parttotal      , // 46 parttotal
    397392                             $this->category_type  , // 48 category type
    398393                             $this->recordedid     , // 49 recordedid
     394                             $this->inputname      , // 50 input name
    399395                            )
    400396                      );
    401397    }