Skip to content

Commit

Permalink
Fix pass-by-reference calls. Closes #69
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.wp-plugins.org/buddypress-courseware/trunk@498795 b8457f37-d9ea-0310-8a92-e5e31aec5664
  • Loading branch information
sushkov committed Feb 1, 2012
1 parent bffe114 commit 493eb91
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
12 changes: 6 additions & 6 deletions activity/activity.class.php
Expand Up @@ -65,8 +65,8 @@ function activity_for_assignment( $assignment, $type = "add" ){

groups_record_activity(
array(
'action' => apply_filters( 'courseware_assignment_activity_action', $activity_action, $assignment->ID, $assignment->post_content, &$assignment ),
'content' => apply_filters( 'courseware_assignment_activity_content', $activity_content, $assignment->ID, $assignment->post_content, &$assignment ),
'action' => apply_filters( 'courseware_assignment_activity_action', $activity_action, $assignment->ID, $assignment->post_content, $assignment ),
'content' => apply_filters( 'courseware_assignment_activity_content', $activity_content, $assignment->ID, $assignment->post_content, $assignment ),
'primary_link' => apply_filters( 'courseware_assignment_activity_primary_link', "{$primary_link}#post-{$assignment->ID}" ),
'type' => "assignment_$type",
'item_id' => $bp->groups->current_group->id
Expand Down Expand Up @@ -95,8 +95,8 @@ function activity_for_lecture( $lecture, $type = "add" ){

groups_record_activity(
array(
'action' => apply_filters( 'courseware_course_activity_action', $activity_action, $lecture->ID, $lecture->post_content, &$lecture ),
'content' => apply_filters( 'courseware_course_activity_content', $activity_content, $lecture->ID, $lecture->post_content, &$lecture ),
'action' => apply_filters( 'courseware_course_activity_action', $activity_action, $lecture->ID, $lecture->post_content, $lecture ),
'content' => apply_filters( 'courseware_course_activity_content', $activity_content, $lecture->ID, $lecture->post_content, $lecture ),
'primary_link' => apply_filters( 'courseware_course_activity_primary_link', "{$primary_link}#post-{$lecture->ID}" ),
'type' => "lecture_$type",
'item_id' => $bp->groups->current_group->id
Expand Down Expand Up @@ -130,8 +130,8 @@ function activity_for_response( $response_data, $type = "add" ){

groups_record_activity(
array(
'action' => apply_filters( 'courseware_response_activity_action', $activity_action, $response->ID, $response->post_content, &$response ),
'content' => apply_filters( 'courseware_response_activity_content', $activity_content, $response->ID, $response->post_content, &$response ),
'action' => apply_filters( 'courseware_response_activity_action', $activity_action, $response->ID, $response->post_content, $response ),
'content' => apply_filters( 'courseware_response_activity_content', $activity_content, $response->ID, $response->post_content, $response ),
'primary_link' => apply_filters( 'courseware_response_activity_primary_link', "{$primary_link}#post-{$response->ID}" ),
'type' => "response_$type",
'item_id' => $bp->groups->current_group->id
Expand Down
3 changes: 2 additions & 1 deletion courses/courses.class.php
Expand Up @@ -325,7 +325,8 @@ function single_course_screen( $vars ) {
$vars['trail'] = array(
$course->post_title => $course->permalink
);
return apply_filters( 'courseware_course', &$vars );
$vars = apply_filters( 'courseware_course', $vars );
return $vars;
}

/**
Expand Down
6 changes: 3 additions & 3 deletions groups/groups.class.php
Expand Up @@ -126,7 +126,7 @@ function screen_handler() {
* Courseware action to manage group navigation options
*/
function nav_options() {
apply_filters( 'courseware_group_nav_options', &$this->nav_options );
$this->nav_options = apply_filters( 'courseware_group_nav_options', $this->nav_options );
$this->load_template( array(
'name' => '_nav',
'nav_options' => $this->nav_options,
Expand Down Expand Up @@ -165,9 +165,9 @@ function load_template( $vars = '' ) {

//Exclude internal templates like navigation, starts with an underscore
if( substr( $vars['name'], 0, 1) != '_' )
apply_filters( 'courseware_group_template', &$vars );
$vars = apply_filters( 'courseware_group_template', $vars );
else
apply_filters( 'courseware_template_vars', &$vars );
$vars = apply_filters( 'courseware_template_vars', $vars );

if( file_exists( $templates_path . $vars['name']. '.php' ) ) {
ob_start();
Expand Down

0 comments on commit 493eb91

Please sign in to comment.