Merge pull request Arcavias#45 from nsendetzky/master

Improves compatibility with xampp environments
foment · Apr 4, 2014 · b6cfdef · b6cfdef
2 parents 7e1c34b ebb464b
commit b6cfdef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/admin/Init.php b/admin/Init.php
@@ -52,8  52,8 @@ public function getJsonRpcController()
 
 	/**
 	 * Creates a array of all available translations
-	 * 
-	 * @return array List of language IDs with labels 
 	 *
 	 * @return array List of language IDs with labels
 	 */
 	public function getAvailableLanguages()
 	{
@@ -119,7  119,6 @@ public function getHtml( $absdir, $relpath )
 
 		$relpath = rtrim( $relpath, '/' );
 		$abslen = strlen( $absdir );
-		$ds = DIRECTORY_SEPARATOR;
 		$html = '';
 
 		foreach( $this->_arcavias->getCustomPaths( 'client/extjs' ) as $base => $paths )
@@ -128,8  127,8 @@ public function getHtml( $absdir, $relpath )
 
 			foreach( $paths as $path )
 			{
-				$jsbPath = $relpath . $relJsbPath . $ds . $path;
-				$jsbAbsPath = $base . $ds . $path;
 				$jsbPath = $relpath . $relJsbPath . '/' . $path;
 				$jsbAbsPath = $base . '/' . $path;
 
 				if( !is_file( $jsbAbsPath ) ) {
 					throw new Exception( sprintf( 'JSB2 file "%1$s" not found', $jsbAbsPath ) );

diff --git a/admin/index.php b/admin/index.php
@@ -18,7  18,7 @@
 
 	$configPaths = array( $basedir. 'config', $appdir . 'config' );
 
-	$arcavias = new Arcavias( array( $basedir . 'ext' ), true, dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'arcavias' . DIRECTORY_SEPARATOR . 'arcavias-core' . DIRECTORY_SEPARATOR );
 	$arcavias = new Arcavias( array( $basedir . 'ext' ), true, dirname(__DIR__) . '/vendor/arcavias/arcavias-core/' );
 	$init = new Init( $arcavias, $configPaths );
 
 	$html = $init->getHtml( realpath($_SERVER['SCRIPT_FILENAME']), $_SERVER['SCRIPT_NAME'] );