jmertic         Wed Apr  1 19:47:32 2009 UTC

  Modified files:              
    /win-installer      GenPHPInstaller.wxs.php 
  Log:
  Fix check for correct php.ini to work for 5.2 and 5.3+ install builds.
  
http://cvs.php.net/viewvc.cgi/win-installer/GenPHPInstaller.wxs.php?r1=1.12&r2=1.13&diff_format=u
Index: win-installer/GenPHPInstaller.wxs.php
diff -u win-installer/GenPHPInstaller.wxs.php:1.12 
win-installer/GenPHPInstaller.wxs.php:1.13
--- win-installer/GenPHPInstaller.wxs.php:1.12  Tue Mar 24 22:13:00 2009
+++ win-installer/GenPHPInstaller.wxs.php       Wed Apr  1 19:47:32 2009
@@ -44,7 +44,10 @@
 $PHPInstallerBaseWXS->save("PHPInstaller$version.wxs");
 
 // remove extension info from php.ini-production
-$infile = fopen("Files/php.ini-production",'r');
+if ( is_file("Files/php.ini-production") )
+       $infile = fopen("Files/php.ini-production",'r');
+else
+       $infile = fopen("Files/php.ini-recommended",'r');
 $outfile = fopen("Files/php.ini",'w');
 if (!$outfile || !$infile) {
        echo "Cannot open php.ini or php.ini-production\n";



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to