From eff4faea7f3c95440f02ea45d0be4f67236e2bf3 Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
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/pages/views/default/river/object/page/annotate.php     | 2 +-
 mod/pages/views/default/river/object/page/create.php       | 2 +-
 mod/pages/views/default/river/object/page/update.php       | 2 +-
 mod/pages/views/default/river/object/page_top/annotate.php | 2 +-
 mod/pages/views/default/river/object/page_top/create.php   | 2 +-
 mod/pages/views/default/river/object/page_top/update.php   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'mod/pages/views/default/river')

diff --git a/mod/pages/views/default/river/object/page/annotate.php b/mod/pages/views/default/river/object/page/annotate.php
index 4f913dbaa..811fc7dea 100644
--- a/mod/pages/views/default/river/object/page/annotate.php
+++ b/mod/pages/views/default/river/object/page/annotate.php
@@ -10,7 +10,7 @@ $performed_by = $statement->getSubject();
 $object = $statement->getObject();
 
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$string = sprintf(elgg_echo("pages:river:posted"),$url) . " ";
+$string = elgg_echo("pages:river:posted", array($url)) . " ";
 $string .= "<a href=\"" . $object->getURL() . "\">" . elgg_echo("pages:river:annotate:create") . "</a> " . $object->title;
 //$string .= "<div class=\"river_content\">" . $object->title . "</div>";
 
diff --git a/mod/pages/views/default/river/object/page/create.php b/mod/pages/views/default/river/object/page/create.php
index d182a1ebe..f85e4d42e 100644
--- a/mod/pages/views/default/river/object/page/create.php
+++ b/mod/pages/views/default/river/object/page/create.php
@@ -12,7 +12,7 @@ $url = $object->getURL();
 
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 $contents = strip_tags($object->description); //strip tags from the contents to stop large images etc blowing out the river view
-$string = sprintf(elgg_echo("pages:river:created"),$url) . " ";
+$string = elgg_echo("pages:river:created", array($url)) . " ";
 $string .= elgg_echo("pages:river:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a> <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created) ."</span> <a class='river_comment_form_button link'>Comment</a>";
 $string .= elgg_view('likes/forms/link', array('entity' => $object));
 $string .= "<div class=\"river_content_display\">";
diff --git a/mod/pages/views/default/river/object/page/update.php b/mod/pages/views/default/river/object/page/update.php
index 82b38f315..8ae506a51 100644
--- a/mod/pages/views/default/river/object/page/update.php
+++ b/mod/pages/views/default/river/object/page/update.php
@@ -10,7 +10,7 @@ $object = get_entity($vars['item']->object_guid);
 $url = $object->getURL();
 
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$string = sprintf(elgg_echo("pages:river:updated"),$url) . " ";
+$string = elgg_echo("pages:river:updated", array($url)) . " ";
 $string .= elgg_echo("pages:river:update") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
 
 echo $string;
diff --git a/mod/pages/views/default/river/object/page_top/annotate.php b/mod/pages/views/default/river/object/page_top/annotate.php
index 43270f736..e12eb55f9 100644
--- a/mod/pages/views/default/river/object/page_top/annotate.php
+++ b/mod/pages/views/default/river/object/page_top/annotate.php
@@ -10,7 +10,7 @@ $performed_by = $statement->getSubject();
 $object = $statement->getObject();
 
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$string = sprintf(elgg_echo("pages:river:posted"),$url) . " ";
+$string = elgg_echo("pages:river:posted", array($url)) . " ";
 $string .= elgg_echo("pages:river:annotate:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
 
 echo $string;
diff --git a/mod/pages/views/default/river/object/page_top/create.php b/mod/pages/views/default/river/object/page_top/create.php
index d49f3d5c4..d951a2f6a 100644
--- a/mod/pages/views/default/river/object/page_top/create.php
+++ b/mod/pages/views/default/river/object/page_top/create.php
@@ -10,6 +10,6 @@ $performed_by = $statement->getSubject();
 $object = $statement->getObject();
 
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$string = sprintf(elgg_echo("pages:river:created"),$url) . " ";
+$string = elgg_echo("pages:river:created", array($url)) . " ";
 $string .= elgg_echo("pages:river:create") . "<a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
 echo $string;
\ No newline at end of file
diff --git a/mod/pages/views/default/river/object/page_top/update.php b/mod/pages/views/default/river/object/page_top/update.php
index 6187f54bc..611cd21e9 100644
--- a/mod/pages/views/default/river/object/page_top/update.php
+++ b/mod/pages/views/default/river/object/page_top/update.php
@@ -10,7 +10,7 @@ $performed_by = $statement->getSubject();
 $object = $statement->getObject();
 
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$string = sprintf(elgg_echo("pages:river:updated"),$url) . " ";
+$string = elgg_echo("pages:river:updated", array($url)) . " ";
 $string .= elgg_echo("pages:river:update") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
 
 echo $string;
\ No newline at end of file
-- 
cgit v1.2.3