Merge pull request #269 from JonnyWong16/miscellaneous-fixes

Miscellaneous fixes
This commit is contained in:
drzoidberg33 2015-11-02 23:17:41 +02:00
commit c60340d88b
7 changed files with 13 additions and 14 deletions

View file

@ -848,7 +848,7 @@ class DataFactory(object):
media_type = 'artist'
if query_string and media_type:
query = {'query_string': query_string.replace('"', ''),
query = {'query_string': query_string,
'title': title,
'parent_title': parent_title,
'grandparent_title': grandparent_title,

View file

@ -920,7 +920,7 @@ class PUSHOVER(object):
data = {'token': self.application_token,
'user': plexpy.CONFIG.PUSHOVER_KEYS,
'title': event,
'title': event.encode("utf-8"),
'message': message.encode("utf-8"),
'sound': plexpy.CONFIG.PUSHOVER_SOUND,
'priority': plexpy.CONFIG.PUSHOVER_PRIORITY}

View file

@ -1366,8 +1366,7 @@ class WebInterface(object):
return json.dumps({'message': 'no data received'})
@cherrypy.expose
def search(self, search_query=''):
query = search_query.replace('"', '')
def search(self, query=''):
return serve_template(templatename="search.html", title="Search", query=query)