monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-11 05:33:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/dev'

Browse source
This commit is contained in:
echel0n 2014-07-07 11:30:41 -07:00
commit 5fda7e8afd
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gui/slick/interfaces/default/displayShow.tmpl
View file

@ -329,9 +329,8 @@
#end if
</td>
<td>
#if $epResult["location"] != "" and $epResult["location"] != None:
#set $root_dirs = $sickbeard.ROOT_DIRS.split('|')
#set $video_root = $root_dirs[int(root_dirs[0]) + 1]
#if $epResult["location"]:
#set $video_root = $os.path.dirname($show._location)
<video id="$epResult["indexerid"]" class="video-js vjs-default-skin"
controls preload="none" width="64" height="64"
poster="$sbRoot/showPoster/?show=$show.indexerid&amp;which=poster_thumb" data-setup="{}">

4
sickbeard/metadata/mede8er.py
View file

@ -197,7 +197,7 @@ class Mede8erMetadata(mediabrowser.MediaBrowserMetadata):
cast = etree.SubElement(tv_node, "cast")
if myShow["_actors"] != None:
if getattr(myShow, '_actors', None) is not None:
for actor in myShow['_actors']:
cur_actor_name_text = actor['name']
@ -328,7 +328,7 @@ class Mede8erMetadata(mediabrowser.MediaBrowserMetadata):
cast = etree.SubElement(episode, "cast")
if myShow["_actors"] != None:
if getattr(myShow, '_actors', None) is not None:
for actor in myShow['_actors']:
cur_actor_name_text = actor['name']