diff options
| author | Karl Vollmer <vollmerk@ampache.org> | 2011-11-28 16:07:24 -0400 |
|---|---|---|
| committer | Karl Vollmer <vollmerk@ampache.org> | 2011-11-28 16:07:24 -0400 |
| commit | 7d9313f80888f96c67066b255c0383350b6dd199 (patch) | |
| tree | a0235b33c2d2d555585d16e9655ba81f132b3623 | |
| parent | ac366c1c0c19747b517d1ec503c97167687e929a (diff) | |
| parent | ca3fe67e49c1b69ad8c9127620a6968cfb3e17f9 (diff) | |
| download | ampache-7d9313f80888f96c67066b255c0383350b6dd199.tar.gz ampache-7d9313f80888f96c67066b255c0383350b6dd199.tar.bz2 ampache-7d9313f80888f96c67066b255c0383350b6dd199.zip | |
Merge branch 'master' of gitorious.org:ampache/ampache
| -rwxr-xr-x | docs/CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/class/search.class.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG index a0c79971..aac78124 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,7 @@ -------------------------------------------------------------------------- v.3.6-Alpha2 + - Fixed video searches (reported by mchugh19) - Fixed Database Upgrade issue that caused catalog user/pass for remote catalogs to not be added correctly - Added the ability to locally cache passwords validated by external diff --git a/lib/class/search.class.php b/lib/class/search.class.php index cdb9422e..e5b9386b 100644 --- a/lib/class/search.class.php +++ b/lib/class/search.class.php @@ -1033,7 +1033,7 @@ class Search extends playlist_object { } // switch on ruletype } // foreach rule - $where_sql = explode(" $sql_logic_operator ", $where); + $where_sql = implode(" $sql_logic_operator ", $where); return array( 'base' => 'SELECT DISTINCT(`video`.`id`) FROM `video`', |