summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2005-12-18 03:04:59 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2005-12-18 03:04:59 +0000
commit0154f3736070c0847c5912dca88954b6bebe6001 (patch)
treebb40a15d7d9b475f5ff5c0ed85d32a6e932d1428 /modules
parent1ce04520cdadbc03726da96608a8b5bbb20ee95a (diff)
downloadampache-0154f3736070c0847c5912dca88954b6bebe6001.tar.gz
ampache-0154f3736070c0847c5912dca88954b6bebe6001.tar.bz2
ampache-0154f3736070c0847c5912dca88954b6bebe6001.zip
added ability to rename/merge artists thx spcombs
Diffstat (limited to 'modules')
-rw-r--r--modules/init.php2
-rw-r--r--modules/lib.php30
2 files changed, 1 insertions, 31 deletions
diff --git a/modules/init.php b/modules/init.php
index c3eea572..69d3480c 100644
--- a/modules/init.php
+++ b/modules/init.php
@@ -83,7 +83,7 @@ if (!$results['conf']['allow_stream_playback']) {
}
$results['conf']['web_path'] = $http_type . $_SERVER['HTTP_HOST'] . $results['conf']['web_path'];
-$results['conf']['version'] = '3.3.2-Alpha4 (Build 001)';
+$results['conf']['version'] = '3.3.2-Alpha4 (Build 002)';
$results['conf']['catalog_file_pattern']= 'mp3|mpc|m4p|m4a|mp4|aac|ogg|rm|wma|asf|flac|spx';
$results['libglue']['local_table'] = 'session';
$results['libglue']['local_sid'] = 'id';
diff --git a/modules/lib.php b/modules/lib.php
index 57601af2..6a825255 100644
--- a/modules/lib.php
+++ b/modules/lib.php
@@ -10,36 +10,6 @@
*/
/*
- * show_artist_pulldown()
- *
- * Helper functions for album and artist functions
- *
- */
-
-function show_artist_pulldown ($artist) {
-
- global $settings;
- $dbh = dbh();
-
- $query = "SELECT id,name FROM artist ORDER BY name";
- $db_result = mysql_query($query, $dbh);
- echo "\n<select name=\"artist\">\n";
-
- while ( $r = mysql_fetch_row($db_result) ) {
- // $r[0] = id, $r[1] = name
- if ( $artist == $r[0] ) {
- echo "<option value=\"$r[0]\" selected=\"selected\">". htmlspecialchars($r[1]) ."</option>\n";
- }
- else {
- echo "<option value=\"$r[0]\">". htmlspecialchars($r[1]) ."</option>\n";
- }
- }
-
- echo " </select>";
-} // show_artist_pulldown()
-
-
-/*
* show_album_pulldown()
*
*/