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/bookmarks/start.php                                       | 10 +++++-----
 mod/bookmarks/views/default/bookmarks/bookmarklet.php         |  2 +-
 mod/bookmarks/views/default/river/object/bookmarks/create.php |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'mod/bookmarks')

diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index ca367deb2..808f88ede 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -59,7 +59,7 @@ function bookmarks_pagesetup() {
 	if (isloggedin()) {
 		if ($page_owner instanceof ElggGroup && elgg_get_context() == 'groups') {
 			if ($page_owner->bookmarks_enable != "no") {
-				//add_submenu_item(sprintf(elgg_echo("bookmarks:group"),$page_owner->name), "pg/bookmarks/" . $page_owner->username . '/items');
+				//add_submenu_item(elgg_echo("bookmarks:group",array($page_owner->name), "pg/bookmarks/" . $page_owner->username . '/items'));
 			}
 		}
 	}
@@ -96,7 +96,7 @@ function bookmarks_page_handler($page) {
 		$content = elgg_echo("bookmarks:unknown_user");
 
 		$body = elgg_view_layout('one_column_with_sidebar', $content, $sidebar);
-		echo elgg_view_page(sprintf(elgg_echo("bookmarks:user"), elgg_get_page_owner()->name), $body);
+		echo elgg_view_page(elgg_echo("bookmarks:user", array(elgg_get_page_owner()->name)), $body);
 
 		return FALSE;
 	}
@@ -112,7 +112,7 @@ function bookmarks_page_handler($page) {
 	if ($owner) {
 		switch($section) {
 			case 'friends':
-				elgg_push_breadcrumb(sprintf(elgg_echo('bookmarks:friends'), $owner->name));
+				elgg_push_breadcrumb(elgg_echo('bookmarks:friends', array($owner->name)));
 
 				$content = list_user_friends_objects($owner->getGUID(), 'bookmarks', 10, false, false);
 				$context = ($owner == $logged_in_user) ? 'friends' : '';
@@ -120,7 +120,7 @@ function bookmarks_page_handler($page) {
 
 			default:
 			case 'items':
-				elgg_push_breadcrumb(sprintf(elgg_echo('bookmarks:user'), $owner->name));
+				elgg_push_breadcrumb(elgg_echo('bookmarks:user', array($owner->name)));
 
 				group_gatekeeper();
 				$options = array(
@@ -240,7 +240,7 @@ function bookmarks_page_handler($page) {
 
 	$content = $header . $content;
 	$body = elgg_view_layout('one_column_with_sidebar', $content, $sidebar);
-	echo elgg_view_page(sprintf(elgg_echo("bookmarks:user"), elgg_get_page_owner()->name), $body);
+	echo elgg_view_page(elgg_echo("bookmarks:user", array(elgg_get_page_owner()->name)), $body);
 
 	return TRUE;
 }
diff --git a/mod/bookmarks/views/default/bookmarks/bookmarklet.php b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
index 5cb8ca6d8..17a304d78 100644
--- a/mod/bookmarks/views/default/bookmarks/bookmarklet.php
+++ b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
@@ -9,7 +9,7 @@ $page_owner = elgg_get_page_owner();
 $bookmarktext = elgg_echo("bookmarks:this");
 
 if ($page_owner instanceof ElggGroup) {
-	$bookmarktext = sprintf(elgg_echo("bookmarks:this:group"), $page_owner->name);
+	$bookmarktext = elgg_echo("bookmarks:this:group", array($page_owner->name));
 	$name = "group:$page_owner->guid";
 } else {
 	$name = $page_owner->username;
diff --git a/mod/bookmarks/views/default/river/object/bookmarks/create.php b/mod/bookmarks/views/default/river/object/bookmarks/create.php
index faffdec5d..32434471b 100644
--- a/mod/bookmarks/views/default/river/object/bookmarks/create.php
+++ b/mod/bookmarks/views/default/river/object/bookmarks/create.php
@@ -8,7 +8,7 @@ $object = get_entity($vars['item']->object_guid);
 $is_group = get_entity($object->container_guid);
 $url = $object->getURL();
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$string = sprintf(elgg_echo("bookmarks:river:created"),$url) . " ";
+$string = elgg_echo("bookmarks:river:created", array($url)) . " ";
 $string .= "<a href=\"" . $object->address . "\">" . $object->title . "</a>";
 if (($is_group instanceof ElggGroup) && (elgg_get_context() != 'groups')){
 	$string .= " " . elgg_echo('bookmarks:ingroup') . " <a href=\"{$is_group->getURL()}\">" . $is_group->name . "</a>";
-- 
cgit v1.2.3