From eff4faea7f3c95440f02ea45d0be4f67236e2bf3 Mon Sep 17 00:00:00 2001 From: brettp Date: Wed, 3 Nov 2010 22:13:10 +0000 Subject: Fixes #1320: Bundled mods use elgg_echo()'s internal string substitution. git-svn-id: http://code.elgg.org/elgg/trunk@7229 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/groups/views/default/river/forum/create.php | 4 ++-- mod/groups/views/default/river/forum/topic/create.php | 6 +++--- mod/groups/views/default/river/group/create.php | 4 ++-- .../views/default/river/object/groupforumtopic/annotate.php | 4 ++-- mod/groups/views/default/river/object/groupforumtopic/create.php | 4 ++-- mod/groups/views/default/river/object/groupforumtopic/update.php | 8 ++++---- mod/groups/views/default/river/relationship/member/create.php | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) (limited to 'mod/groups/views/default/river') diff --git a/mod/groups/views/default/river/forum/create.php b/mod/groups/views/default/river/forum/create.php index ce3638f15..69481e97e 100644 --- a/mod/groups/views/default/river/forum/create.php +++ b/mod/groups/views/default/river/forum/create.php @@ -11,12 +11,12 @@ $group_guid = $object->container_guid; //grab the annotation, if one exists if($vars['item']->annotation_id != 0) { - $comment = get_annotation($vars['item']->annotation_id)->value; + $comment = get_annotation($vars['item']->annotation_id)->value; } $comment = strip_tags($comment);//this is so we don't get large images etc in the activity river $url = elgg_get_site_url() . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid; $url_user = "getURL()}\">{$performed_by->name}"; - $string = sprintf(elgg_echo("groupforum:river:posted"),$url_user) . " "; + $string = elgg_echo("groupforum:river:posted", array($url_user)) . " "; $string .= elgg_echo("groupforum:river:annotate:create") . " | " . $object->title . " ". elgg_view_friendly_time($object->time_created) ."Visit discussion"; $string .= elgg_view('likes/forms/link', array('entity' => $object)); $string .= ""; diff --git a/mod/groups/views/default/river/forum/topic/create.php b/mod/groups/views/default/river/forum/topic/create.php index bb38e1cf3..e595b1fdc 100644 --- a/mod/groups/views/default/river/forum/topic/create.php +++ b/mod/groups/views/default/river/forum/topic/create.php @@ -7,13 +7,13 @@ $group_guid = $object->container_guid; $group = get_entity($group_guid); $url = elgg_get_site_url() . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid; - //$comment = $object->getAnnotations("group_topic_post", 1, 0, "asc"); + //$comment = $object->getAnnotations("group_topic_post", 1, 0, "asc"); //foreach($comment as $c){ $contents = $object->description; //} $contents = strip_tags($contents);//this is so we don't get large images etc in the activity river $url_user = "getURL()}\">{$performed_by->name}"; - $string = sprintf(elgg_echo("groupforum:river:postedtopic"),$url_user) . ": "; + $string = elgg_echo("groupforum:river:postedtopic", array($url_user)) . ": "; $string .= "" . $object->title . ""; $string .= " " . elgg_echo('groups:ingroup') . " getURL()}\">" . $group->name . ""; $string .= " ". elgg_view_friendly_time($object->time_created); @@ -25,5 +25,5 @@ $string .= "
"; $string .= elgg_get_excerpt($contents, 200); $string .= "
"; - + echo $string; \ No newline at end of file diff --git a/mod/groups/views/default/river/group/create.php b/mod/groups/views/default/river/group/create.php index aa9fef47a..ef0aaab1b 100644 --- a/mod/groups/views/default/river/group/create.php +++ b/mod/groups/views/default/river/group/create.php @@ -3,9 +3,9 @@ $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); $object = get_entity($vars['item']->object_guid); $objecturl = $object->getURL(); - + $url = "getURL()}\">{$performed_by->name}"; - $string = sprintf(elgg_echo("groups:river:create"), $url) . " "; + $string = elgg_echo("groups:river:create", array($url)) . " "; $string .= " getURL() . "\">" . $object->name . ""; $string .= " ". elgg_view_friendly_time($object->time_created); if (isloggedin()) { diff --git a/mod/groups/views/default/river/object/groupforumtopic/annotate.php b/mod/groups/views/default/river/object/groupforumtopic/annotate.php index c6aa1e5ab..5456b8302 100644 --- a/mod/groups/views/default/river/object/groupforumtopic/annotate.php +++ b/mod/groups/views/default/river/object/groupforumtopic/annotate.php @@ -3,9 +3,9 @@ $statement = $vars['statement']; $performed_by = $statement->getSubject(); $object = $statement->getObject(); - + $url = "getURL()}\">{$performed_by->name}"; - $string = sprintf(elgg_echo("groupforum:river:posted"),$url) . " "; + $string = elgg_echo("groupforum:river:posted", array($url)) . " "; $string .= elgg_echo("groupforum:river:annotate:create") . " | getURL() . "\">" . $object->title . ""; //$string .= "
Title: " . $object->title . "
"; diff --git a/mod/groups/views/default/river/object/groupforumtopic/create.php b/mod/groups/views/default/river/object/groupforumtopic/create.php index 7c7d89bad..d9bebc003 100644 --- a/mod/groups/views/default/river/object/groupforumtopic/create.php +++ b/mod/groups/views/default/river/object/groupforumtopic/create.php @@ -3,9 +3,9 @@ $statement = $vars['statement']; $performed_by = $statement->getSubject(); $object = $statement->getObject(); - + $url = "getURL()}\">{$performed_by->name}"; - $string = sprintf(elgg_echo("groupforum:river:created"),$url) . " "; + $string = elgg_echo("groupforum:river:created", array($url)) . " "; $string .= elgg_echo("groupforum:river:create") . " | getURL() . "\">" . $object->title . ""; //$string .= "
Discussion topic: " . $object->title . "
"; diff --git a/mod/groups/views/default/river/object/groupforumtopic/update.php b/mod/groups/views/default/river/object/groupforumtopic/update.php index d13c2b61f..ba9b91d2c 100644 --- a/mod/groups/views/default/river/object/groupforumtopic/update.php +++ b/mod/groups/views/default/river/object/groupforumtopic/update.php @@ -3,11 +3,11 @@ $statement = $vars['statement']; $performed_by = $statement->getSubject(); $object = $statement->getObject(); - + $url = "getURL()}\">{$performed_by->name}"; - $string = sprintf(elgg_echo("groupforum:river:updated"),$url) . " "; - $string .= elgg_echo("groupforum:river:update") . " | getURL() . "\">" . $object->title . ""; - + $string = elgg_echo("groupforum:river:updated", array($url)) . " "; + $string .= elgg_echo("groupforum:river:update") . " | getURL() . "\">" . $object->title . ""; + ?> \ No newline at end of file diff --git a/mod/groups/views/default/river/relationship/member/create.php b/mod/groups/views/default/river/relationship/member/create.php index a568920cc..3ba191676 100644 --- a/mod/groups/views/default/river/relationship/member/create.php +++ b/mod/groups/views/default/river/relationship/member/create.php @@ -5,7 +5,7 @@ $objecturl = $object->getURL(); $url = "getURL()}\">{$performed_by->name}"; - $string = sprintf(elgg_echo("groups:river:member"),$url) . " "; + $string = elgg_echo("groups:river:member", array($url)) . " "; $string .= " getURL() . "\">" . $object->name . ""; $string .= " ". elgg_view_friendly_time($vars['item']->posted); $string .= ""; -- cgit v1.2.3