summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Grissom <grissoma@gmail.com>2011-04-18 13:01:56 -0400
committerPaul Arthur <flowerysong00@yahoo.com>2011-04-18 13:01:56 -0400
commit36bc6d51071ed7d3c28106a9c982dae5e0679557 (patch)
tree7d8c13292f7418c7f4e2d31905ad342be4582b02
parenta273b0e5660bf37c019553b358a14b101a977b5d (diff)
downloadampache-36bc6d51071ed7d3c28106a9c982dae5e0679557.tar.gz
ampache-36bc6d51071ed7d3c28106a9c982dae5e0679557.tar.bz2
ampache-36bc6d51071ed7d3c28106a9c982dae5e0679557.zip
Fix display of duplicate search
-rw-r--r--admin/duplicates.php3
-rwxr-xr-xdocs/CHANGELOG1
2 files changed, 3 insertions, 1 deletions
diff --git a/admin/duplicates.php b/admin/duplicates.php
index a0d6457a..c4185c92 100644
--- a/admin/duplicates.php
+++ b/admin/duplicates.php
@@ -38,7 +38,8 @@ show_header();
/* Switch on Action */
switch ($_REQUEST['action']) {
case 'find_duplicates':
- $duplicates = Catalog::get_duplicate_songs($_REQUEST['search_type']);
+ $search_type = Dba::escape($_REQUEST['search_type']);
+ $duplicates = Catalog::get_duplicate_songs($search_type);
require_once Config::get('prefix') . '/templates/show_duplicate.inc.php';
require_once Config::get('prefix') . '/templates/show_duplicates.inc.php';
break;
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 60b80271..80792b38 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,7 @@
--------------------------------------------------------------------------
v.3.6-Alpha1
+ - Fixed duplicate searching (patch from Demonic)
- byterange handling for ranges starting with 0 (patch from uberbrady)
- Fixed issue with updating ACLs under Windows (reported by Citlali)
- Add function that check ampache and php version from each website.