Skip to content
Snippets Groups Projects
Commit e5cb9333 authored by Stein Magne Bjorklund's avatar Stein Magne Bjorklund
Browse files

Make sure Importer use the new application constant

- Also require the file. Force it to fail hard if not found.
parent afc0f2d8
No related branches found
No related tags found
1 merge request!16Resolve "Introduce PSR-4 autoloading"
...@@ -175,8 +175,10 @@ class Importer ...@@ -175,8 +175,10 @@ class Importer
private function createNamespaces($ns) private function createNamespaces($ns)
{ {
require('namespaces.php'); require_once LOADSPEAKR_ROOT . '/namespaces.php';
global $conf;
$namespaces = ""; $namespaces = "";
try { try {
foreach ($ns as $k => $v) { foreach ($ns as $k => $v) {
if ($conf["ns"][$k] != $v) { if ($conf["ns"][$k] != $v) {
...@@ -193,6 +195,7 @@ class Importer ...@@ -193,6 +195,7 @@ class Importer
echo 'Caught exception while importing namespaces: ', $e->getMessage(), "\n"; echo 'Caught exception while importing namespaces: ', $e->getMessage(), "\n";
exit(1); exit(1);
} }
return $namespaces; return $namespaces;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment