diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-01-12 07:45:01 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-01-12 07:45:01 +0000 |
| commit | 0b39cf3100870d54e13039a4e5d8635f121df4ab (patch) | |
| tree | 44a4d54aa9e1dc2f0f7484d74fe367a868ac40a1 /lib/class | |
| parent | 65929b1bcc5e8692dd6e716d3066fbd92d754a26 (diff) | |
| download | ampache-0b39cf3100870d54e13039a4e5d8635f121df4ab.tar.gz ampache-0b39cf3100870d54e13039a4e5d8635f121df4ab.tar.bz2 ampache-0b39cf3100870d54e13039a4e5d8635f121df4ab.zip | |
few minor fixes including a XML-RPC fix
Diffstat (limited to 'lib/class')
| -rw-r--r-- | lib/class/catalog.class.php | 6 | ||||
| -rw-r--r-- | lib/class/flag.class.php | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php index db60e18c..9131aac5 100644 --- a/lib/class/catalog.class.php +++ b/lib/class/catalog.class.php @@ -1148,7 +1148,6 @@ class Catalog { $new_song->artist = $this->check_artist($data[0]); $new_song->album = $this->check_album($data[1],$data[4]); $new_song->title = $data[2]; - $new_song->comment = $data[3]; $new_song->year = $data[4]; $new_song->bitrate = $data[5]; $new_song->rate = $data[6]; @@ -1932,11 +1931,10 @@ class Catalog { $url = sql_escape($song->file); $title = $this->check_title($song->title); $title = sql_escape($title); - $comment = sql_escape($song->comment); $current_time = time(); - $sql = "INSERT INTO song (file,catalog,album,artist,title,bitrate,rate,mode,size,time,track,genre,addition_time,year,comment)" . - " VALUES ('$url','$song->catalog','$song->album','$song->artist','$title','$song->bitrate','$song->rate','$song->mode','$song->size','$song->time','$song->track','$song->genre','$current_time','$song->year','$comment')"; + $sql = "INSERT INTO song (file,catalog,album,artist,title,bitrate,rate,mode,size,time,track,genre,addition_time,year)" . + " VALUES ('$url','$song->catalog','$song->album','$song->artist','$title','$song->bitrate','$song->rate','$song->mode','$song->size','$song->time','$song->track','$song->genre','$current_time','$song->year')"; $db_results = mysql_query($sql, dbh()); if (!$db_results) { diff --git a/lib/class/flag.class.php b/lib/class/flag.class.php index 05d51583..0e86f643 100644 --- a/lib/class/flag.class.php +++ b/lib/class/flag.class.php @@ -226,7 +226,7 @@ class Flag { switch ($this->object_type) { case 'song': $song = new Song($this->object_id); - $song->format_song(); + $song->format(); $name = $song->f_title . " - " . $song->f_artist; $title = $song->title . " - " . $song->get_artist_name(); break; |