felipe Fri Oct 17 01:58:20 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar/phar pharcommand.inc
Log:
- MFH: Fixed bug #45726 (PHP_Archive / Archive.php missing)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/pharcommand.inc?r1=1.49.2.12&r2=1.49.2.13&diff_format=u
Index: php-src/ext/phar/phar/pharcommand.inc
diff -u php-src/ext/phar/phar/pharcommand.inc:1.49.2.12
php-src/ext/phar/phar/pharcommand.inc:1.49.2.13
--- php-src/ext/phar/phar/pharcommand.inc:1.49.2.12 Fri Sep 12 16:09:01 2008
+++ php-src/ext/phar/phar/pharcommand.inc Fri Oct 17 01:58:20 2008
@@ -488,7 +488,9 @@
if (isset($loader)) {
$s = "<?php if (!class_exists('PHP_Archive'))
{\n?>";
- $s .= file_get_contents($loader);
+ if (is_file($loader)) {
+ $s .= file_get_contents($loader);
+ }
$s .= "<?php\n";
$s .= "}\n";
$s .= "if (!in_array('phar',
stream_get_wrappers())) {\n";
@@ -1550,7 +1552,7 @@
$use_ext = extension_loaded('phar');
$version = array(
'PHP Version' => phpversion(),
- 'phar.phar version' => '$Revision: 1.49.2.12 $',
+ 'phar.phar version' => '$Revision: 1.49.2.13 $',
'Phar EXT version' => $use_ext ? phpversion('phar') :
'Not available',
'Phar API version' => Phar::apiVersion(),
'Phar-based phar archives' => true,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
