summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/classes/FeedStatus.php (renamed from FeedStatus.php)0
-rw-r--r--includes/feed_lib.php (renamed from feed_lib.php)4
-rw-r--r--index.php2
-rw-r--r--modules/mod_feed.php2
-rw-r--r--modules/mod_status.php2
5 files changed, 5 insertions, 5 deletions
diff --git a/FeedStatus.php b/includes/classes/FeedStatus.php
index 8edf1be..8edf1be 100644
--- a/FeedStatus.php
+++ b/includes/classes/FeedStatus.php
diff --git a/feed_lib.php b/includes/feed_lib.php
index fcfb7d8..2f4f949 100644
--- a/feed_lib.php
+++ b/includes/feed_lib.php
@@ -45,7 +45,7 @@ function feed_get_actions( $pListHash ) {
if( !empty($action['content_id']) ) { //indicates that this isn't a direct action, more of a "status update" ex. "Ronald is pleased with his artwork"
if( $content = LibertyContent::getLibertyObject($action['content_id']) ) {
$contentType = $content->getContentType();
- $action['real_log'] = BitUser::getDisplayNameFromHash( empty( $pListHash['no_link_user'] ), $action ).' ';
+ $action['real_log'] = BitUser::getDisplayNameFromHash( $action, empty( $pListHash['no_link_user'] ) ).' ';
if(!empty($overrides[strtolower($contentType)])){
$action['real_log'] .= $overrides[$contentType]['conjugation_phrase'];
if($overrides[$contentType]['is_target_linked'] == 'y'){
@@ -155,7 +155,7 @@ function feed_set_status( $pParamHash ){
global $gBitDb;
- require_once ('FeedStatus.php');
+ require_once ( FEED_PKG_CLASSES_PATH.'FeedStatus.php');
$status = new FeedStatus();
diff --git a/index.php b/index.php
index 354f54e..2e1f7d1 100644
--- a/index.php
+++ b/index.php
@@ -14,7 +14,7 @@
// +----------------------------------------------------------------------+
require_once( '../kernel/includes/setup_inc.php' );
-require_once( FEED_PKG_PATH.'feed_lib.php' );
+require_once( FEED_PKG_INCLUDE_PATH.'feed_lib.php' );
$gBitSystem->verifyPermission( 'p_feed_master' );
$listHash['max_records'] = 100;
diff --git a/modules/mod_feed.php b/modules/mod_feed.php
index 494522b..7c7584c 100644
--- a/modules/mod_feed.php
+++ b/modules/mod_feed.php
@@ -14,7 +14,7 @@
*/
global $gQueryUser,$gBitSmarty;
-require_once( FEED_PKG_PATH.'feed_lib.php' );
+require_once( FEED_PKG_INCLUDE_PATH.'feed_lib.php' );
if( !empty($gQueryUser) ){
diff --git a/modules/mod_status.php b/modules/mod_status.php
index d1f619b..ceb2785 100644
--- a/modules/mod_status.php
+++ b/modules/mod_status.php
@@ -14,7 +14,7 @@
*/
global $gQueryUser,$gBitSmarty;
-require_once( FEED_PKG_PATH.'feed_lib.php' );
+require_once( FEED_PKG_INCLUDE_PATH.'feed_lib.php' );
if( !empty( $_REQUEST['feed_status'] ) ){