From 318700ad7cd0e67bf02a1e6777cb5c2cd4c3b240 Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Sun, 30 Dec 2007 01:49:13 +0000
Subject: fixed paging on browse catalogs page, disabled the write_tags script
 and removed a dbl escape on the preferences

---
 lib/class/browse.class.php | 4 ++++
 lib/class/dba.class.php    | 2 +-
 lib/init.php               | 2 +-
 lib/preferences.php        | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/class/browse.class.php b/lib/class/browse.class.php
index 2e65a783..ae82d271 100644
--- a/lib/class/browse.class.php
+++ b/lib/class/browse.class.php
@@ -619,6 +619,8 @@ class Browse {
 			${$class_name} = new $class_name($id); 
 		} 
 
+		Ajax::start_container('browse_content');
+
 		// Switch on the type of browsing we're doing
 		switch ($_SESSION['browse']['type']) { 
 			case 'song': 
@@ -676,6 +678,8 @@ class Browse {
 			break;
 		} // end switch on type
 
+		Ajax::end_container(); 
+
 	} // show_object
 
 	/**
diff --git a/lib/class/dba.class.php b/lib/class/dba.class.php
index 3facabd3..3a348a46 100644
--- a/lib/class/dba.class.php
+++ b/lib/class/dba.class.php
@@ -56,6 +56,7 @@ class Dba {
 
 		// Run the query
 		$resource = mysql_query($sql,self::dbh()); 
+		debug_event('Query',$sql,'6');
 		
 		// Save the query, to make debug easier
 		self::$_sql = $sql; 
@@ -85,7 +86,6 @@ class Dba {
 	public static function fetch_assoc($resource) { 
 
 		$result = mysql_fetch_assoc($resource); 
-		debug_event('Assoc',self::$_sql,'6'); 
 
 		if (!$result) { 
 			return array(); 
diff --git a/lib/init.php b/lib/init.php
index 15ccf72d..01f15bb2 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -81,7 +81,7 @@ if (!count($results)) {
 } 
 
 /** This is the version.... fluf nothing more... **/
-$results['version']		= '3.4-Beta2 Build (001)';
+$results['version']		= '3.4-Beta2 Build (002)';
 $results['int_config_version']	= '6'; 
 
 $results['raw_web_path']	= $results['web_path'];
diff --git a/lib/preferences.php b/lib/preferences.php
index ea77ce02..7247bf63 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -49,7 +49,7 @@ function update_preferences($pref_id=0) {
 		$name 		= $data['name'];
 		$apply_to_all	= "check_" . $data['name'];
 		$id		= $data['id'];
-		$value 		= Dba::escape(scrub_in($_REQUEST[$name]));
+		$value 		= scrub_in($_REQUEST[$name]);
 
 		/* Some preferences require some extra checks to be performed */
 		switch ($name) { 
-- 
cgit