svn: /php/php-src/trunk/ext/phar/phar/ pharcommand.inc
| From: | Greg Beaver | Date: | Fri, 24 Jul 2009 02:04:52 +0000 |
| Subject: | svn: /php/php-src/trunk/ext/phar/phar/ pharcommand.inc | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-59759@lists.php.net to get a copy of this message | ||
cellog Fri, 24 Jul 2009 02:04:52 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=284677
Log:
fix unmerged syntax fix
Changed paths:
U php/php-src/trunk/ext/phar/phar/pharcommand.inc
Modified: php/php-src/trunk/ext/phar/phar/pharcommand.inc
===================================================================
--- php/php-src/trunk/ext/phar/phar/pharcommand.inc 2009-07-24 02:03:24 UTC (rev 284676)
+++ php/php-src/trunk/ext/phar/phar/pharcommand.inc 2009-07-24 02:04:52 UTC (rev 284677)
@@ -217,7 +217,7 @@
$pear = false;
foreach ($path as $component) {
if (file_exists($component . DIRECTORY_SEPARATOR . 'pear')
- && is_executable($component . DIRECTORY_SEPARATOR . 'pear'))) {
+ && is_executable($component . DIRECTORY_SEPARATOR . 'pear')) {
$pear = true;
break;
}