--- a/htdocs/version.php Sat Dec 17 16:51:33 2005 -0500
+++ b/htdocs/version.php Sat Dec 17 22:31:54 2005 -0500
@@ -18,10 +18,10 @@
-$cvs = (strpos($version, 'cvs') !== false) || (strpos($version, 'beta') !== false);
+$cvs = ((strpos($version, 'cvs') !== false) || (strpos($version, 'beta') !== false)); $win32 = ($build == 'gaim-win32');
$my_ver = str_replace('cvs', '', $version);
-$my_ver = str_replace('beta', '', $version);
+$my_ver = preg_replace('/beta(\d+)$/', '', $my_ver); $my_ver = preg_replace('/-(\d+)$/', '', $my_ver);
$cur_ver = ($win32 ? $current_win32_version : $current_version);
@@ -61,13 +61,13 @@
-function parse_changelog($filename, $firstversion) {
+function parse_changelog($filename, $cur_ver, $firstversion) { $f = fopen($filename, "r");
$changelog_text = fread($f, filesize($filename));
/* skip the Pimpin' Penguin line */
- $startpos = strpos($changelog_text, 'version');
+ $startpos = strpos($changelog_text, "version $cur_ver"); $oldpos = strpos($changelog_text, "version $firstversion ", $startpos);
@@ -78,10 +78,10 @@
-print parse_changelog($changelog_file, $my_ver);
+print parse_changelog($changelog_file, $cur_ver, $my_ver); print "Win32 Changes:\n\n";
- print parse_changelog($changelog_file_win32, $my_ver);
+ print parse_changelog($changelog_file_win32, $cur_ver, $my_ver);