summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-11-04 16:16:55 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-11-04 16:16:55 +0000
commitf6cc5f19d2d3746a1adae1b3f7cd4e784127f02c (patch)
treec84932cee06a39cc1a08389990747506b5e3019b /bin
parent0665818aeaf221e1b60fe8bc1de71b12270122de (diff)
downloadampache-f6cc5f19d2d3746a1adae1b3f7cd4e784127f02c.tar.gz
ampache-f6cc5f19d2d3746a1adae1b3f7cd4e784127f02c.tar.bz2
ampache-f6cc5f19d2d3746a1adae1b3f7cd4e784127f02c.zip
fixed catalog_update bin file and fixed a conf() reference on update all on admin catalog stuff
Diffstat (limited to 'bin')
-rw-r--r--bin/catalog_update.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/catalog_update.inc b/bin/catalog_update.inc
index f081b98b..9d69dfa5 100644
--- a/bin/catalog_update.inc
+++ b/bin/catalog_update.inc
@@ -30,16 +30,16 @@ echo "[catalog_update.php.inc]\nStarting Catalog Clean/Update And Add\n\n";
if (count($_SERVER['argv']) > 1) {
for ($x = 1; $x < count($_SERVER['argv']); $x++) {
if ($where) $where .= " OR ";
- $where .= "name LIKE '%" . preg_replace("/[^a-z0-9\. -]/i", "", $_SERVER['argv'][$x]) . "%'";
+ $where .= "name LIKE '%" . Dba::escape(preg_replace("/[^a-z0-9\. -]/i", "", $_SERVER['argv'][$x])) . "%'";
}
}
if ($where) $where = "($where) AND catalog_type='local'";
else $where = "catalog_type='local'";
$sql = "SELECT id FROM catalog";
if ($where) $sql .= " WHERE $where";
-$db_results = mysql_query($sql, dbh());
+$db_results = Dba::query($sql);
-while ($r = mysql_fetch_row($db_results)) {
+while ($r = Dba::fetch_row($db_results)) {
$catalog = new Catalog($r[0]);