diff options
author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-12-31 07:50:45 +0000 |
---|---|---|
committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-12-31 07:50:45 +0000 |
commit | fe4774127f292ce94ab79771bc72cbb7ca4db371 (patch) | |
tree | d8cba0fe9520260c86f8a7cbe9b06bc077780ce8 /lib | |
parent | 9e5afd340f0fd74c0da852be1f24cfe5285e38e8 (diff) | |
download | ampache-fe4774127f292ce94ab79771bc72cbb7ca4db371.tar.gz ampache-fe4774127f292ce94ab79771bc72cbb7ca4db371.tar.bz2 ampache-fe4774127f292ce94ab79771bc72cbb7ca4db371.zip |
fixed a mistake on the ratings, added it to artist and fixed location detection
Diffstat (limited to 'lib')
-rw-r--r-- | lib/class/album.class.php | 2 | ||||
-rw-r--r-- | lib/ui.lib.php | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/class/album.class.php b/lib/class/album.class.php index 12f0af24..5b56d90a 100644 --- a/lib/class/album.class.php +++ b/lib/class/album.class.php @@ -420,7 +420,7 @@ class Album { /* Log this if we're doin debug */ if (conf('debug')) { - log_event($GLOBALS['user']->username,'amazon-xml',"Searched using $search_term with " . conf('amazon_developer_key') . " as key " . count($final_results) . " results found"); + log_event($GLOBALS['user']->username,'amazon-xml',"Searched using $keywords with " . conf('amazon_developer_key') . " as key " . count($final_results) . " results found"); } } // if no cover diff --git a/lib/ui.lib.php b/lib/ui.lib.php index 1f1665d6..77693a05 100644 --- a/lib/ui.lib.php +++ b/lib/ui.lib.php @@ -986,7 +986,8 @@ function get_location() { } /* Sanatize the $_SERVER['PHP_SELF'] variable */ - $location['page'] = preg_replace("/^\/(.+\.php)\/?.*/","$1",$source); + $source = str_replace(conf('raw_web_path'),"",$source); + $location['page'] = preg_replace("/^\/(.+\.php)\/?.*/","$1",$source); switch ($location['page']) { case 'index.php': |