Changeset 194062
- Timestamp:
- 01/14/2010 10:32:05 PM (16 years ago)
- Location:
- lifestream/trunk
- Files:
-
- 4 edited
-
inc/core.php (modified) (3 diffs)
-
inc/labels.php (modified) (2 diffs)
-
inc/widget.php (modified) (2 diffs)
-
lifestream.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
lifestream/trunk/inc/core.php
r193742 r194062 120 120 if (count($this->data) > 1) 121 121 { 122 if ( $this->lifestream->get_option('show_owners'))122 if (@$options['show_owners'] || $this->lifestream->get_option('show_owners')) 123 123 { 124 124 $label = $label_inst->get_label_plural_user(); … … 131 131 else 132 132 { 133 if ( $this->lifestream->get_option('show_owners'))133 if (@$options['show_owners'] || $this->lifestream->get_option('show_owners')) 134 134 { 135 135 $label = $label_inst->get_label_single_user(); … … 653 653 } 654 654 add_feed('lifestream-feed', 'lifestream_rss_feed'); 655 656 $this->is_buddypress = (function_exists('bp_is_blog_page') ? true : false); 655 657 656 658 // If this is an update we need to force reactivation -
lifestream/trunk/inc/labels.php
r193355 r194062 22 22 23 23 // backwards compatibility 24 function _get_user_label() { return $this->get_user_label(); } 24 function _get_user_label() 25 { 26 return $this->get_user_label(); 27 } 25 28 26 29 function get_single_link() … … 36 39 function get_user_label() 37 40 { 41 if ($this->lifestream->is_buddypress) 42 { 43 return $this->lifestream->get_anchor_html(htmlspecialchars($this->event->owner), htmlspecialchars(bp_core_get_userurl($this->event->owner_id))); 44 } 38 45 return $this->event->owner; 39 46 } -
lifestream/trunk/inc/widget.php
r193666 r194062 28 28 echo $before_title . ($options['title'] ? apply_filters('widget_title', $options['title']) : $lifestream->__('Lifestream')) . $after_title; 29 29 30 lifestream_sidebar_widget(array(30 $args = array( 31 31 'limit'=>$options['amount'], 32 32 'feed_ids'=>$options['feeds'], … … 35 35 'event_total_max'=>-1, 36 36 'date_interval'=>-1, 37 )); 37 ); 38 39 if ($lifestream->is_buddypress && is_home()) 40 { 41 $args['show_owners'] = 1; 42 } 43 lifestream_sidebar_widget($args); 38 44 // Do stuff for this widget, drawing data from $options[$number] 39 45 -
lifestream/trunk/lifestream.php
r193745 r194062 21 21 define('LIFESTREAM_PLUGIN_FILE', plugin_basename(__FILE__)); 22 22 define('LIFESTREAM_PATH', dirname(__FILE__)); 23 define('LIFESTREAM_URL', plugins_url($path = '/'.LIFESTREAM_PATH)); 23 24 define('LIFESTREAM_FEEDS_PER_PAGE', 10); 24 25 define('LIFESTREAM_EVENTS_PER_PAGE', 25);
Note: See TracChangeset
for help on using the changeset viewer.