diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-01-01 04:51:29 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-01-01 04:51:29 +0000 |
| commit | 0f1d0178097a7ea7d76df1a20fba3a73c4ba2da2 (patch) | |
| tree | c136d5011dd2f0e2318446c4eb65b3e83c95db2e | |
| parent | 93b1be95c90992dfe5d89beba2ee5a53884b709d (diff) | |
| download | ampache-0f1d0178097a7ea7d76df1a20fba3a73c4ba2da2.tar.gz ampache-0f1d0178097a7ea7d76df1a20fba3a73c4ba2da2.tar.bz2 ampache-0f1d0178097a7ea7d76df1a20fba3a73c4ba2da2.zip | |
final commits before the release
| -rwxr-xr-x | docs/CHANGELOG | 4 | ||||
| -rw-r--r-- | lib/class/update.class.php | 2 | ||||
| -rw-r--r-- | templates/footer.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_install_lang.inc.php | 11 | ||||
| -rw-r--r-- | templates/sidebar_home.inc.php | 2 |
5 files changed, 11 insertions, 10 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG index e2c6009e..0fbc228e 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -3,7 +3,9 @@ -------------------------------------------------------------------------- -------------------------------------------------------------------------- - v.3.5-Alpha1 + v.3.5-Alpha1 12/31/2008 + - Fixed sort_files script so that it properly handles variable + album art file names in the directories - Fixed issue where small thumbnails were used for larger images if gd based resizing was enabled in the config - Fixed catalog_update.inc so it doesn't produce errors diff --git a/lib/class/update.class.php b/lib/class/update.class.php index fd22f326..257cfa7c 100644 --- a/lib/class/update.class.php +++ b/lib/class/update.class.php @@ -293,8 +293,6 @@ class Update { $version[] = array('version'=> '350003','description'=>$update_string); - - return $version; } // populate_version diff --git a/templates/footer.inc.php b/templates/footer.inc.php index 678779b3..544fe34a 100644 --- a/templates/footer.inc.php +++ b/templates/footer.inc.php @@ -28,7 +28,7 @@ </div> <!-- end id="maincontainer"--> <div id="footer"> <a href="http://www.ampache.org/index.php">Ampache v.<?php echo Config::get('version'); ?></a><br /> - Copyright (c) 2001 - 2008 Ampache.org + Copyright (c) 2001 - 2009 Ampache.org <?php echo _('Queries:'); ?><?php echo Dba::$stats['query']; ?> <?php echo _('Cache Hits:'); ?><?php echo database_object::$cache_hit; ?> </div> </body> diff --git a/templates/show_install_lang.inc.php b/templates/show_install_lang.inc.php index 91cb606b..a9edf27e 100644 --- a/templates/show_install_lang.inc.php +++ b/templates/show_install_lang.inc.php @@ -57,7 +57,7 @@ echo " <font color=\"red\">ERROR</font> " . phpversion(); $results = $results + 1; } else { - echo " <font color=\"green\"> OK </font> " . phpversion(); + echo " <font color=\"green\"> OK </font><i>" . phpversion() . "</i>"; } ?> </p> @@ -67,10 +67,11 @@ echo " <font color=\"red\">ERROR</font> "; $results = $results + 1; } else { - if(strcmp('5.0.0',mysql_get_server_info()) > 0) { - echo " <font color=\"#FF6600\"> WARNING </font> " . mysql_get_server_info() . "<strong>We recommend MySQL version more than 5.0.0</strong>"; + if(strcmp('5.0.0',mysql_get_client_info()) > 0) { + echo " <font color=\"#FF6600\"> WARNING </font> " . mysql_get_client_info() . "<strong>We recommend MySQL version more than 5.0.0</strong>"; } else { - echo " <font color=\"green\"> OK </font> " . mysql_get_server_info(); + echo " <font color=\"green\"> OK </font>"; + echo "<i>" . mysql_get_client_info() . "</i>"; } } ?> @@ -116,7 +117,7 @@ ?> </p> <hr /> - <h4><?php echo _('Option'); ?></h4> + <h4><?php echo _('Optional'); ?></h4> <p><?php echo _('Gettext Support'); ?>: <?php if (!function_exists('gettext')) { diff --git a/templates/sidebar_home.inc.php b/templates/sidebar_home.inc.php index 8a23c23c..01c7d076 100644 --- a/templates/sidebar_home.inc.php +++ b/templates/sidebar_home.inc.php @@ -32,7 +32,7 @@ $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path'); <li id="sb_browse_bb_SongTitle"><a href="<?php echo $web_path; ?>/browse.php?action=song"><?php echo _('Song Title'); ?></a></li> <li id="sb_browse_bb_Album"><a href="<?php echo $web_path; ?>/browse.php?action=album"><?php echo _('Albums'); ?></a></li> <li id="sb_browse_bb_Artist"><a href="<?php echo $web_path; ?>/browse.php?action=artist"><?php echo _('Artist'); ?></a></li> - <li id="sb_browse_bb_Tags"><a href="<?php echo $web_path; ?>/browse.php?action=tag"><?php echo _('Tag Cloud'); ?></a></li> + <!-- <li id="sb_browse_bb_Tags"><a href="<?php echo $web_path; ?>/browse.php?action=tag"><?php echo _('Tag Cloud'); ?></a></li> --> <li id="sb_browse_bb_Playlist"><a href="<?php echo $web_path; ?>/browse.php?action=playlist"><?php echo _('Playlist'); ?></a></li> <li id="sb_browse_bb_RadioStation"><a href="<?php echo $web_path; ?>/browse.php?action=live_stream"><?php echo _('Radio Stations'); ?></a></li> </ul> |