Fixed confusion with lib directory defines.

diff --git a/defines.php b/defines.php
index af2537b..f12f900 100644 (file)
--- a/defines.php
+++ b/defines.php
@@ -69,7 +69,8 @@ define('GLM_MEMBERS_CONTACTS_PLUGIN_SETUP_PATH', GLM_MEMBERS_CONTACTS_PLUGIN_PAT
 // Parameters related to the Main GLM Member DB plugin - Depending on what's going on these may already defined by the main plugin
 $pluginsPath = str_replace(GLM_MEMBERS_CONTACTS_PLUGIN_SLUG, '', GLM_MEMBERS_CONTACTS_PLUGIN_PATH);
 define('GLM_MEMBERS_CONTACTS_MAIN_PLUGIN_PATH', $pluginsPath.'glm-member-db');
-define('GLM_MEMBERS_CONTACTS_PLUGIN_LIB_PATH', GLM_MEMBERS_CONTACTS_MAIN_PLUGIN_PATH.'/lib');
+define('GLM_MEMBERS_CONTACTS_MAIN_PLUGIN_LIB_PATH', GLM_MEMBERS_CONTACTS_MAIN_PLUGIN_PATH.'/lib');
+define('GLM_MEMBERS_CONTACTS_PLUGIN_LIB_PATH', GLM_MEMBERS_CONTACTS_PLUGIN_PATH.'/lib');
 define('GLM_MEMBERS_CONTACTS_PLUGIN_MEDIA_PATH', $WPUploadDir['basedir'].'/'.GLM_MEMBERS_CONTACTS_PLUGIN_SLUG);
 define('GLM_MEMBERS_CONTACTS_PLUGIN_IMAGES_PATH', GLM_MEMBERS_CONTACTS_MAIN_PLUGIN_PATH.'/images');
 

diff --git a/models/admin/contacts/index.php b/models/admin/contacts/index.php
index 8760158..1523490 100644 (file)
--- a/models/admin/contacts/index.php
+++ b/models/admin/contacts/index.php
@@ -218,7 +218,7 @@ class GlmMembersAdmin_contacts_index extends GlmDataContacts
 
                 $contactInfo = $this->newEntry();
 
-                require_once GLM_MEMBERS_CONTACTS_PLUGIN_LIB_PATH.'/EasyPassword/EasyPassword.php';
+                require_once GLM_MEMBERS_CONTACTS_MAIN_PLUGIN_LIB_PATH.'/EasyPassword/EasyPassword.php';
                 $EasyPassword = new EasyPassword();
                 $contactInfo['fieldData']['password'] = $EasyPassword->generateEasyPassword('firstlast');