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/search/views/default/search/comments/entity.php | 4 ++--
 mod/search/views/default/search/listing.php         | 2 +-
 mod/search/views/default/search/startblurb.php      | 2 +-
 mod/search/views/rss/search/comments/entity.php     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'mod/search/views')

diff --git a/mod/search/views/default/search/comments/entity.php b/mod/search/views/default/search/comments/entity.php
index 008455242..0cd760664 100644
--- a/mod/search/views/default/search/comments/entity.php
+++ b/mod/search/views/default/search/comments/entity.php
@@ -17,7 +17,7 @@ if ($owner instanceof ElggUser) {
 
 // @todo Sometimes we find comments on entities we can't display...
 if ($entity->getVolatileData('search_unavailable_entity')) {
-	$title = sprintf(elgg_echo('search:comment_on'), elgg_echo('search:unavailable_entity'));
+	$title = elgg_echo('search:comment_on', array(elgg_echo('search:unavailable_entity')));
 	// keep anchor for formatting.
 	$title = "<a>$title</a>";
 } else {
@@ -35,7 +35,7 @@ if ($entity->getVolatileData('search_unavailable_entity')) {
 		$title = elgg_echo('item:' . $entity->getType());
 	}
 
-	$title = sprintf(elgg_echo('search:comment_on'), $title);
+	$title = elgg_echo('search:comment_on', array($title));
 	$url = $entity->getURL() . '#comment_' . $entity->getVolatileData('search_match_annotation_id');
 	$title = "<a href=\"$url\">$title</a>";
 }
diff --git a/mod/search/views/default/search/listing.php b/mod/search/views/default/search/listing.php
index c9dda25f0..d84d567d4 100644
--- a/mod/search/views/default/search/listing.php
+++ b/mod/search/views/default/search/listing.php
@@ -84,7 +84,7 @@ $more = ($more_check > 0) ? $more_check : 0;
 
 if ($more) {
 	$title_key = ($more == 1) ? 'comment' : 'comments';
-	$more_str = sprintf(elgg_echo('search:more'), $count, $type_str);
+	$more_str = elgg_echo('search:more', array($count, $type_str));
 	$more_link = "<div class='search_listing'><a href=\"$url\">$more_str</a></div>";
 } else {
 	$more_link = '';
diff --git a/mod/search/views/default/search/startblurb.php b/mod/search/views/default/search/startblurb.php
index 2b7230709..3ffa39e68 100644
--- a/mod/search/views/default/search/startblurb.php
+++ b/mod/search/views/default/search/startblurb.php
@@ -4,4 +4,4 @@
  * @subpackage Core
  */
 
-echo sprintf(elgg_echo("tag:search:startblurb"), $vars['query']);
+echo elgg_echo("tag:search:startblurb", array($vars['query']));
diff --git a/mod/search/views/rss/search/comments/entity.php b/mod/search/views/rss/search/comments/entity.php
index 9bdc062c7..46ef87a14 100644
--- a/mod/search/views/rss/search/comments/entity.php
+++ b/mod/search/views/rss/search/comments/entity.php
@@ -16,7 +16,7 @@ if ($author) {
 
 // @todo Sometimes we find comments on entities we can't display...
 if ($entity->getVolatileData('search_unavailable_entity')) {
-	$title = sprintf(elgg_echo('search:comment_on'), elgg_echo('search:unavailable_entity'));
+	$title = elgg_echo('search:comment_on', array(elgg_echo('search:unavailable_entity')));
 } else {
 	if ($entity->getType() == 'object') {
 		$title = $entity->title;
@@ -32,7 +32,7 @@ if ($entity->getVolatileData('search_unavailable_entity')) {
 		$title = elgg_echo('item:' . $entity->getType());
 	}
 
-	$title = sprintf(elgg_echo('search:comment_on'), $title);
+	$title = elgg_echo('search:comment_on', array($title));
 	$title .= ' ' . elgg_echo('search:comment_by') . ' ' . $author_name;
 	$url = $entity->getURL() . '#annotation-' . $entity->getVolatileData('search_match_annotation_id');
 }
-- 
cgit v1.2.3