From e5cb93334a33f94022efb349a0973c04d87b08b5 Mon Sep 17 00:00:00 2001
From: Stein Magne Bjorklund <steinmb@smbjorklund.com>
Date: Fri, 17 Sep 2021 15:08:02 +0200
Subject: [PATCH] Make sure Importer use the new application constant
- Also require the file. Force it to fail hard if not found.
---
classes/Importer.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/classes/Importer.php b/classes/Importer.php
index 89c5efef..90226c1a 100644
--- a/classes/Importer.php
+++ b/classes/Importer.php
@@ -175,8 +175,10 @@ class Importer
private function createNamespaces($ns)
{
- require('namespaces.php');
+ require_once LOADSPEAKR_ROOT . '/namespaces.php';
+ global $conf;
$namespaces = "";
+
try {
foreach ($ns as $k => $v) {
if ($conf["ns"][$k] != $v) {
@@ -193,6 +195,7 @@ class Importer
echo 'Caught exception while importing namespaces: ', $e->getMessage(), "\n";
exit(1);
}
+
return $namespaces;
}
--
GitLab