diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-04-09 04:28:56 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-04-09 04:28:56 +0000 |
| commit | 7b1e57d0ccdda52881645f7c16f42ceb5da15881 (patch) | |
| tree | f5ab9bcad4009845e4bc99010b195207084b3abf /lib | |
| parent | de5f1c00d30c01d7e8628dafe8e4c02b2f3c61ea (diff) | |
| download | ampache-7b1e57d0ccdda52881645f7c16f42ceb5da15881.tar.gz ampache-7b1e57d0ccdda52881645f7c16f42ceb5da15881.tar.bz2 ampache-7b1e57d0ccdda52881645f7c16f42ceb5da15881.zip | |
fixed playlist add problem and a few other minor bugs
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/class/catalog.class.php | 4 | ||||
| -rw-r--r-- | lib/class/update.class.php | 11 | ||||
| -rw-r--r-- | lib/general.lib.php | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php index 125fc4f5..43becdac 100644 --- a/lib/class/catalog.class.php +++ b/lib/class/catalog.class.php @@ -377,7 +377,7 @@ class Catalog { if (is_readable($full_file)) { - if (substr($file,-3,3) == 'm3u') { + if (substr($file,-3,3) == 'm3u' AND $parse_m3u) { $this->_playlists[] = $full_file; } // if it's an m3u @@ -774,7 +774,7 @@ class Catalog { $this->catalog_type = $type; /* Fluf */ - echo _("Starting Catalog Build") . " [$name]<br />\n"; + echo _('Starting Catalog Build') . " [$name]<br />\n"; if ($this->catalog_type == 'remote') { diff --git a/lib/class/update.class.php b/lib/class/update.class.php index 1fb90350..a8da5062 100644 --- a/lib/class/update.class.php +++ b/lib/class/update.class.php @@ -1585,6 +1585,17 @@ class Update { $user->fix_preferences($r['username']); } // while results + /* Last but not least revert play types to downsample or stream */ + $sql = "SELECT id FROM preferences WHERE name='play_type'"; + $db_results = mysql_query($sql, dbh()); + + $results = mysql_fetch_assoc($db_results); + + $pref_id = $results['id']; + + $sql = "UPDATE user_preference SET value='stream' WHERE preference='$pref_id' AND value != 'downsample' AND value != 'stream'"; + $db_results = mysql_query($sql, dbh()); + $this->set_version('db_version','332010'); } // update_332010 diff --git a/lib/general.lib.php b/lib/general.lib.php index 82b0c38f..a1a83c95 100644 --- a/lib/general.lib.php +++ b/lib/general.lib.php @@ -803,7 +803,7 @@ function check_username($username) { $db_results = mysql_query($sql, dbh()); if (mysql_fetch_row($db_results)) { - return fakse; + return false; } return true; |