From cc2f4596ffaa36d65a22f8518e19b07a14f830d2 Mon Sep 17 00:00:00 2001 From: Chris 'Duffs' Crevling Date: Wed, 11 Aug 2021 00:55:05 -0700 Subject: [PATCH] Fixing some autoinclude logic. Updating verisoning --- fulcrum.php | 5 +++-- inc/traits/d-primary.php | 3 +-- inc/vendors/plugin-update-checkers/d__setup.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fulcrum.php b/fulcrum.php index 7804a24..c55e03a 100755 --- a/fulcrum.php +++ b/fulcrum.php @@ -6,7 +6,7 @@ * Plugin Name: Fulcrum - Helper Tool * Plugin URI: https://duffion.com * Description: This is the custom built tool that allows for modular helper tools for Fulcrum Synced sites - * Version: 0.9.4 + * Version: 0.9.6 * Author: Chris "Duffs" Crevling * Text Domain: fulcrum-pos * Author URI: https://duffion.com @@ -26,7 +26,7 @@ class D_FULCRUM { - var $version = '0.9.4'; + var $version = '0.9.6'; public $settings = []; @@ -73,6 +73,7 @@ function _load() // Lets create a global instance to make sure we only load items not already loaded // $d_loaded = []; $d_instance = (!isset($d_instance) ? [] : $d_instance); + $this->_define(); require_once $this->dirs['plugin'] . '/' . $this->dirs['inc'] . '/util.php'; require_once $this->dirs['plugin'] . '/' . $this->dirs['traits'] . '/d-primary.php'; diff --git a/inc/traits/d-primary.php b/inc/traits/d-primary.php index 53bd9f4..7969b33 100755 --- a/inc/traits/d-primary.php +++ b/inc/traits/d-primary.php @@ -92,8 +92,7 @@ function autoloader($dirs) $dir = $d_plugin_dirs['plugin'] . '/' . $d_plugin_dirs[$ns]; $scan = scandir($dir); - if ($scan && count($scan) > 0) { - + if ($scan && count($scan) > 0 && $dir !== $d_plugin_dirs['plugin'] . '/') { foreach ($scan as $i => $file) { if ($file !== '.' && $file !== '..' && $file !== '.git' && $file !== '' && file_exists($dir . '/' . $file)) { require_once $dir . '/' . $file; diff --git a/inc/vendors/plugin-update-checkers/d__setup.php b/inc/vendors/plugin-update-checkers/d__setup.php index bfb0afc..d608586 100644 --- a/inc/vendors/plugin-update-checkers/d__setup.php +++ b/inc/vendors/plugin-update-checkers/d__setup.php @@ -20,4 +20,4 @@ //Optional: If you're using a private repository, specify the access token like this: // $update_checker->setAuthentication($config['auth_token']); -$d__plugin_info = $update_checker->getVcsApi()->enableReleaseAssets(); +// $d__plugin_info = $update_checker->getVcsApi()->enableReleaseAssets(); \ No newline at end of file