Skip to content

Commit

Permalink
Follow Bruce's advice and make sure there is some sort of naming conv…
Browse files Browse the repository at this point in the history
…ention for inputs that don't have a displayname

git-svn-id: http://svn.mythtv.org/svn/trunk@11763 7dbf422c-18fa-0310-86e9-fd20926502f2
  • Loading branch information
ex-nerd committed Nov 16, 2006
1 parent 4c6c18f commit cd76fd3
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions modules/tv/detail.php
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,13 @@ function input_select($selected, $ename='prefinput') {
// Gather the data
if (empty($inputs)) {
global $db;
$sh = $db->query('SELECT cardinputid, displayname
$sh = $db->query('SELECT cardinputid,
IF(LENGTH(IFNULL(displayname,"")) > 0,
displayname,
CONCAT(cardid, ":", inputname)
) AS name
FROM cardinput
ORDER BY displayname');
ORDER BY name');
while (list($id, $name) = $sh->fetch_row()) {
$inputs[$id] = $name;
}
Expand Down

0 comments on commit cd76fd3

Please sign in to comment.