diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-07-01 23:51:41 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-07-01 23:51:41 +0000 |
| commit | 4d4712f34166a9138c6c2f627187bfcccbddd169 (patch) | |
| tree | 0207890fc425095acad08db9d1ec64620a284ced /lib/class | |
| parent | c78314791e6b84945f693720c33fcdf9a4ba324f (diff) | |
| download | ampache-4d4712f34166a9138c6c2f627187bfcccbddd169.tar.gz ampache-4d4712f34166a9138c6c2f627187bfcccbddd169.tar.bz2 ampache-4d4712f34166a9138c6c2f627187bfcccbddd169.zip | |
bunch of minor fixes and a db change
Diffstat (limited to 'lib/class')
| -rw-r--r-- | lib/class/catalog.class.php | 11 | ||||
| -rw-r--r-- | lib/class/update.class.php | 11 |
2 files changed, 16 insertions, 6 deletions
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php index eef579ac..1ceaf9ce 100644 --- a/lib/class/catalog.class.php +++ b/lib/class/catalog.class.php @@ -1021,8 +1021,8 @@ class Catalog { } show_box_top(); - echo "\n<br />" . _("Catalog Update Finished") . "... " . _("Total Time") . " [" . date("i:s",$time_diff) . "] " . - _("Total Songs") . " [" . $this->count . "] " . _("Songs Per Seconds") . " [" . $song_per_sec . "]<br /><br />"; + echo "\n<br />" . _('Catalog Update Finished') . "... " . _('Total Time') . " [" . date("i:s",$time_diff) . "] " . + _('Total Songs') . " [" . $this->count . "] " . _('Songs Per Seconds') . " [" . $song_per_sec . "]<br /><br />"; show_box_bottom(); } // add_to_catalog @@ -1594,7 +1594,7 @@ class Catalog { /* Ohh no the artist has lost it's mojo! */ if (!$artist) { - $artist = "Unknown (Orphaned)"; + $artist = _('Unknown (Orphaned)'); } // Remove the prefix so we can sort it correctly @@ -1671,7 +1671,8 @@ class Catalog { /* Ohh no the album has lost it's mojo */ if (!$album) { - $album = "Unknown (Orphaned)"; + $album = _('Unknown (Orphaned)'); + unset($album_year); } // Remove the prefix so we can sort it correctly @@ -1751,7 +1752,7 @@ class Catalog { /* If a genre isn't specified force one */ if (strlen(trim($genre)) < 1) { - $genre = "Unknown (Orphaned)"; + $genre = _('Unknown (Orphaned)'); } if ($this->genres[$genre]) { diff --git a/lib/class/update.class.php b/lib/class/update.class.php index 79556491..067a3753 100644 --- a/lib/class/update.class.php +++ b/lib/class/update.class.php @@ -199,7 +199,10 @@ class Update { $update_string = '- Alter the Session.id to be VARCHAR(64) to account for all potential configs.<br />' . '- Added new user_shout table for Sticky objects / shoutbox.<br />' . - '- Added new playlist preferences, and new preference catagory of playlist.<br />'; + '- Added new playlist preferences, and new preference catagory of playlist.<br />' . + '- Tweaked Now Playing Table.<br />'; + + $version[] = array('version' => '340004','description' => $update_string); return $version; @@ -685,6 +688,12 @@ class Update { $sql = "ALTER TABLE `user_shout` ADD INDEX ( `user` )"; $db_results = Dba::query($sql); + $sql = "ALTER TABLE `now_playing` CHANGE `start_time` `expire` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0'"; + $db_results = Dba::query($sql); + + $sql = "OPTIMIZE TABLE `album`"; + $db_results = Dba::query($sql); + // Update our database version now that we are all done self::set_version('db_version','340004'); |