[ros-diffs] [cfinck] 444: Merge r443

[cfinck at svn.reactos.org]

Author: cfinck
Date: Tue Jul  7 23:14:16 2009
New Revision: 444

URL: http://svn.reactos.org/svn/reactos?rev=444&view=rev
Log:
Merge r443

Modified:
    branches/danny-web/www/www.reactos.org/support/   (props changed)
    branches/danny-web/www/www.reactos.org/support/inc/tools/osversion.php

Propchange: branches/danny-web/www/www.reactos.org/support/
------------------------------------------------------------------------------
    svn:mergeinfo = /trunk/web/reactos.org/htdocs/support:288-336,343-346,443

Modified: branches/danny-web/www/www.reactos.org/support/inc/tools/osversion.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/support/inc/tools/osversion.php?rev=444&r1=443&r2=444&view=diff
==============================================================================
--- branches/danny-web/www/www.reactos.org/support/inc/tools/osversion.php [iso-8859-1] (original)
+++ branches/danny-web/www/www.reactos.org/support/inc/tools/osversion.php [iso-8859-1] Tue Jul  7 23:14:16 2009
@@ -36,34 +36,12 @@
 
 	
 	function show_osversion($osvernumber) { // intern function, don't call this function directly
-		$tempabc = array();
-		$tempd="";
+		$result = mysql_query("SELECT ver_name FROM rsdb_object_osversions WHERE ver_value = '$osvernumber' LIMIT 1");
 		
-		$tempabc = str_split($osvernumber, 1);
+		if(!$result)
+			return "";
 		
-		if ($tempabc[0] != 0) {
-			$tempd .= $tempabc[0];
-		}
-		if ($tempabc[1] != 0) {
-			$tempd .= $tempabc[1];
-		}
-		//if ($tempabc[2] != 0) {
-			$tempd .= $tempabc[2];
-		//}
-		//if ($tempabc[3] != 0) {
-			$tempd .= ".".$tempabc[3];
-		//}
-		//if ($tempabc[4] != 0) {
-			$tempd .= ".".$tempabc[4];
-		//}
-		if ($tempabc[5] != 0) {
-			$tempd .= $tempabc[5];
-		}
-		/*else {
-			$tempd = "unkown";
-		}*/
-		
-		return $tempd;
+		return mysql_result($result, 0);
 	}
 	
 ?>