From: Greg Beaver <cellog@php.net>
Date: Fri, 24 Jul 2009 02:04:52 +0000 (+0000)
Subject: fix unmerged syntax fix
X-Git-Tag: php-5.4.0alpha1~191^2~3005
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b325dca7428a80753fe26cb86d2a27918cb396b4;p=php

fix unmerged syntax fix
---

diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc
index bae6aae8f0..9a111b8d83 100755
--- a/ext/phar/phar/pharcommand.inc
+++ b/ext/phar/phar/pharcommand.inc
@@ -217,7 +217,7 @@ class PharCommand extends CLICommand
 			$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;
 				}