cvs: win-installer / PHPInstallerScripts52.vbs PHPInstallerScripts60.vbs
| From: | John Mertic | Date: | Wed, 11 Feb 2009 17:49:52 +0000 |
| Subject: | cvs: win-installer / PHPInstallerScripts52.vbs PHPInstallerScripts60.vbs | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-56190@lists.php.net to get a copy of this message | ||
jmertic Wed Feb 11 17:49:52 2009 UTC
Modified files:
/win-installer PHPInstallerScripts52.vbs PHPInstallerScripts60.vbs
Log:
Bugs 47024/47111: Use FormatNumber() to format the version number strings to match what the
regional settings say it should be.
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerScripts52.vbs?r1=1.11&r2=1.12&diff_format=u
Index: win-installer/PHPInstallerScripts52.vbs
diff -u win-installer/PHPInstallerScripts52.vbs:1.11 win-installer/PHPInstallerScripts52.vbs:1.12
--- win-installer/PHPInstallerScripts52.vbs:1.11 Wed Feb 4 18:43:59 2009
+++ win-installer/PHPInstallerScripts52.vbs Wed Feb 11 17:49:52 2009
@@ -174,7 +174,7 @@
Exit Sub
End If
- If ( GetWindowsVersion < 5.2 ) Then
+ If ( FormatNumber(GetWindowsVersion) < FormatNumber("5.2") ) Then
'use short path syntax here
Set objFSO = CreateObject("Scripting.FileSystemObject")
Set objFile = objFSO.GetFile(PHPExecutable)
http://cvs.php.net/viewvc.cgi/win-installer/PHPInstallerScripts60.vbs?r1=1.11&r2=1.12&diff_format=u
Index: win-installer/PHPInstallerScripts60.vbs
diff -u win-installer/PHPInstallerScripts60.vbs:1.11 win-installer/PHPInstallerScripts60.vbs:1.12
--- win-installer/PHPInstallerScripts60.vbs:1.11 Wed Feb 4 18:43:59 2009
+++ win-installer/PHPInstallerScripts60.vbs Wed Feb 11 17:49:52 2009
@@ -174,7 +174,7 @@
Exit Sub
End If
- If ( GetWindowsVersion < 5.2 ) Then
+ If ( FormatNumber(GetWindowsVersion) < FormatNumber("5.2") ) Then
'use short path syntax here
Set objFSO = CreateObject("Scripting.FileSystemObject")
Set objFile = objFSO.GetFile(PHPExecutable)