fixed bug: "not indexed" variables in comma separated lists

[phpeclipse.git] / net.sourceforge.phpeclipse.launching / src / net / sourceforge / phpdt / internal / launching / PHPLaunchConfigurationDelegate.java

diff --git a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchConfigurationDelegate.java b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchConfigurationDelegate.java
index cfa568e..483229d 100644 (file)
--- a/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchConfigurationDelegate.java
+++ b/net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchConfigurationDelegate.java
@@ -18,6 +18,7 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
@@ -38,11 +39,13 @@ public class PHPLaunchConfigurationDelegate extends LaunchConfigurationDelegate
        public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
                if (PHPRuntime.getDefault().getSelectedInterpreter() == null)
                        throw new CoreException(new Status(IStatus.ERROR, PHPLaunchingPlugin.PLUGIN_ID, IStatus.OK, "You must define an interpreter before running PHP.", null));
-
+               
+               InterpreterRunnerConfiguration conf=new InterpreterRunnerConfiguration(configuration);
+               conf.setEnvironment(DebugPlugin.getDefault().getLaunchManager().getEnvironment(configuration));
                if (mode.equals("debug")) {
-                       debuggerRunner.run(new InterpreterRunnerConfiguration(configuration), launch);
+                       debuggerRunner.run(conf, launch);
                } else {
-                       interpreterRunner.run(new InterpreterRunnerConfiguration(configuration), launch, null);
+                       interpreterRunner.run(conf, launch);
                }               
        }
 }