Update files that use constants.php

NNTmux · Jan 8, 2018 · 6af3c91 · 6af3c91
1 parent 9b89c88
commit 6af3c91
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 5 deletions.
diff --git a/Changelog b/Changelog
@@ -1,4 +1,5 @@
 2018-01-08 DariusIII
+	* Chg: Update files that use constants.php
 	* Chg: Move constants.php to bootstrap folder, config folder was a bad place
 	* Chg: Move constants.php to config folder
 	* Chg: Update simfony components

diff --git a/NNBase.php b/NNBase.php
@@ -1,10 +1,10 @@
 <?php
 
-include_once __DIR__.DIRECTORY_SEPARATOR.'nntmux/constants.php';
+include_once __DIR__.DIRECTORY_SEPARATOR.'bootstrap/constants.php';
 
 if ($argc > 1) {
     $constant = $argv[1];
-    include_once __DIR__.DIRECTORY_SEPARATOR.'nntmux/constants.php';
+    include_once __DIR__.DIRECTORY_SEPARATOR.'bootstrap/constants.php';
     if (defined($constant)) {
         exit(constant($constant));
     }

diff --git a/_install/install_nntmux.php b/_install/install_nntmux.php
@@ -4,7 +4,6 @@
     define('NN_INSTALLER', true);
 }
 require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'bootstrap/autoload.php';
-include_once dirname(__DIR__).DIRECTORY_SEPARATOR.'nntmux'.DIRECTORY_SEPARATOR.'constants.php';
 
 use nntmux\db\DB;
 use App\Models\User;

diff --git a/public/smarty.php b/public/smarty.php
@@ -18,7 +18,6 @@
  * @author niel
  * @copyright 2015 NN
  */
-require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'nntmux'.DIRECTORY_SEPARATOR.'constants.php';
 require_once NN_ROOT.DS.'bootstrap'.DS.'autoload.php';
 
 use nntmux\config\Configure;

diff --git a/tests/Install/InstallTest.php b/tests/Install/InstallTest.php
@@ -14,7 +14,6 @@
 namespace tests;
 
 require_once \dirname(__DIR__, 2) . DIRECTORY_SEPARATOR . 'bootstrap/autoload.php';
-include_once \dirname(__DIR__, 2) . DIRECTORY_SEPARATOR . 'nntmux' . DIRECTORY_SEPARATOR . 'constants.php';
 
 use App\Extensions\util\Versions;
 use App\Models\User;