aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzzhongwei2012-11-06 06:02:00 (EST)
committerzzhongwei2012-11-06 06:03:30 (EST)
commit418e04003d25d7007b255fef26386186a435b36c (patch)
tree3de70cecfbcf4d52957f17d072117e11e2723c52
parentab79b9bb89b5fc13e97e102948eec59a2168235c (diff)
downloadorg.eclipse.pdt-418e04003d25d7007b255fef26386186a435b36c.zip
org.eclipse.pdt-418e04003d25d7007b255fef26386186a435b36c.tar.gz
org.eclipse.pdt-418e04003d25d7007b255fef26386186a435b36c.tar.bz2
393629: [Roman] During CLI run with Zend Server PHP the additional .ini
files don't get parsed https://bugs.eclipse.org/bugs/show_bug.cgi?id=393629
-rw-r--r--plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/launching/PHPLaunchUtilities.java12
1 files changed, 3 insertions, 9 deletions
diff --git a/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/launching/PHPLaunchUtilities.java b/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/launching/PHPLaunchUtilities.java
index e3c8a03..b719381 100644
--- a/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/launching/PHPLaunchUtilities.java
+++ b/plugins/org.eclipse.php.debug.core/src/org/eclipse/php/internal/debug/core/launching/PHPLaunchUtilities.java
@@ -926,15 +926,9 @@ public class PHPLaunchUtilities {
: "off";
List<String> cmdLineList = new LinkedList<String>();
- if (phpVersion != null && phpVersion.startsWith("4")) {
- cmdLineList.addAll(Arrays.asList(new String[] { phpExe, "-c",
- phpConfigDir, "-d", "asp_tags=" + aspTags, "-d",
- "short_open_tag=" + shortOpenTag, scriptPath }));
- } else {
- cmdLineList.addAll(Arrays.asList(new String[] { phpExe, "-n", "-c",
- phpConfigDir, "-d", "asp_tags=" + aspTags, "-d",
- "short_open_tag=" + shortOpenTag, scriptPath }));
- }
+ cmdLineList.addAll(Arrays.asList(new String[] { phpExe, "-c",
+ phpConfigDir, "-d", "asp_tags=" + aspTags, "-d",
+ "short_open_tag=" + shortOpenTag, scriptPath }));
if (args != null) {
cmdLineList.addAll(Arrays.asList(args));
}