Merge pull request #3 from dialogik/master

Fix issue with PATH separator character on Windows
jakobwesthoff · Mar 25, 2015 · 8581cf0 · 8581cf0
2 parents 500bdba + 26baa2a
commit 8581cf0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/config/config.php b/src/config/config.php
@@ -4,7 +4,7 @@
 
 ini_set(
     'include_path',
-    ini_get( "include_path" ) . ':' . BASEDIR
+    ini_get( "include_path" ) . PATH_SEPARATOR . BASEDIR
 );
 
 require_once( 'classes/base.php' );

diff --git a/src/exceptions/processor/externalExecution.php b/src/exceptions/processor/externalExecution.php
@@ -4,6 +4,10 @@ class plProcessorExternalExecutionException extends Exception
 {
     public function __construct( $output ) 
     {
+    	// Convert array to string if is_array
+    	if(is_array($output)) {
+    		$output = var_export($output, true);
+    	}
         parent::__construct( 'Execution of external program failed:' . "\n" . $output );
     }
 }