Use common loading pattern to support install as module or plugin

TangibleInc · Jan 25, 2025 · 634f6ee · 634f6ee
1 parent 92ce019
commit 634f6ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/index.php b/index.php
@@ -23,7 +23,7 @@ function __call( $method = '', $args = [] ) {
     $caller = current( debug_backtrace() );
     trigger_error("Undefined method \"$method\" for {$this->name}, called from <b>{$caller['file']}</b> in <b>{$caller['line']}</b><br>", E_USER_WARNING);
   }
-  
+
   function load() {
 
     // Parent plugin is expected to load framework

diff --git a/plugin.php b/plugin.php
@@ -10,8 +10,8 @@
 define('TANGIBLE_FIELDS_IS_PLUGIN', true);
 
 $module_path = is_dir(
-  ($path = __DIR__ . '/vendor/tangible')
-) ? $path : __DIR__ . '/..';
+  ($path = __DIR__ . '/../../tangible') // Module
+) ? $path : __DIR__ . '/vendor/tangible'; // Plugin
 
 require_once $module_path . '/framework/index.php';
 require_once $module_path . '/updater/index.php';