diff options
| author | modela bitweaver <spiderr@bitweaver.org> | 2021-04-15 11:59:06 -0400 |
|---|---|---|
| committer | modela bitweaver <spiderr@bitweaver.org> | 2021-04-15 11:59:06 -0400 |
| commit | b8fad2e75324458572d8a96fa7b119b5175fa6fe (patch) | |
| tree | 80e8fb7d5de9b05ccf3472e98cd17527b7806da9 | |
| parent | be4f9df167041e802f49863683d8b94a21b06128 (diff) | |
| download | pigeonholes-b8fad2e75324458572d8a96fa7b119b5175fa6fe.tar.gz pigeonholes-b8fad2e75324458572d8a96fa7b119b5175fa6fe.tar.bz2 pigeonholes-b8fad2e75324458572d8a96fa7b119b5175fa6fe.zip | |
clean up for includes/ reorg
| -rw-r--r-- | includes/bit_setup_inc.php | 4 | ||||
| -rw-r--r-- | includes/classes/Pigeonholes.php (renamed from Pigeonholes.php) | 0 | ||||
| -rw-r--r-- | includes/lookup_pigeonholes_inc.php (renamed from lookup_pigeonholes_inc.php) | 3 | ||||
| -rw-r--r-- | modules/mod_category_suckerfish.php | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/includes/bit_setup_inc.php b/includes/bit_setup_inc.php index 2ed0d3c..c859de5 100644 --- a/includes/bit_setup_inc.php +++ b/includes/bit_setup_inc.php @@ -9,7 +9,7 @@ global $gBitSystem, $gBitUser, $gLibertySystem; $registerHash = array( 'package_name' => 'pigeonholes', - 'package_path' => dirname( __FILE__ ).'/', + 'package_path' => dirname( dirname( __FILE__ ) ).'/', 'service' => LIBERTY_SERVICE_CATEGORIZATION, ); $gBitSystem->registerPackage( $registerHash ); @@ -17,8 +17,6 @@ $gBitSystem->registerPackage( $registerHash ); define( 'PIGEONHOLES_CONTENT_TYPE_GUID', 'pigeonholes' ); if( $gBitSystem->isPackageActive( 'pigeonholes' )) { - // include service functions - require_once( PIGEONHOLES_PKG_PATH.'Pigeonholes.php' ); $tpl = $gBitSystem->isFeatureActive( 'pigeonholes_use_jstab' ) ? 'tab' : 'mini'; $gLibertySystem->registerService( LIBERTY_SERVICE_CATEGORIZATION, PIGEONHOLES_PKG_NAME, array( diff --git a/Pigeonholes.php b/includes/classes/Pigeonholes.php index 558fca9..558fca9 100644 --- a/Pigeonholes.php +++ b/includes/classes/Pigeonholes.php diff --git a/lookup_pigeonholes_inc.php b/includes/lookup_pigeonholes_inc.php index 62ce442..fcd4b4b 100644 --- a/lookup_pigeonholes_inc.php +++ b/includes/lookup_pigeonholes_inc.php @@ -14,6 +14,9 @@ /** * Required Files */ +// include service functions +require_once( PIGEONHOLES_PKG_CLASS_PATH.'Pigeonholes.php' ); + $gContent = new Pigeonholes( ( !empty( $_REQUEST['structure_id'] ) ? $_REQUEST['structure_id'] : NULL ), ( !empty( $_REQUEST['content_id'] ) ? $_REQUEST['content_id'] : NULL ) ); $gContent->load( TRUE ); $gBitSmarty->assignByRef( 'gContent', $gContent ); diff --git a/modules/mod_category_suckerfish.php b/modules/mod_category_suckerfish.php index 8adadc7..5f7e177 100644 --- a/modules/mod_category_suckerfish.php +++ b/modules/mod_category_suckerfish.php @@ -24,7 +24,7 @@ $_template->tpl_vars['moduleTitle'] = new Smarty_variable( isset($moduleParams[' $ns = array(); if($gBitSystem->isPackageActive('pigeonholes')) { - require_once(PIGEONHOLES_PKG_PATH.'Pigeonholes.php'); + require_once(PIGEONHOLES_PKG_CLASS_PATH.'Pigeonholes.php'); $p = new Pigeonholes(); $s = new LibertyStructure(); |