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

17 files changed, 24 insertions, 24 deletions

diff --git a/mod/pages/history.php b/mod/pages/history.php
index 6070a3fd0..d39bf7ae0 100644
--- a/mod/pages/history.php
+++ b/mod/pages/history.php
@@ -25,7 +25,8 @@ $offset = (int)get_input('offset');
 $page_guid = get_input('page_guid');
 $pages = get_entity($page_guid);
 
-add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
+add_submenu_item(elgg_echo("pages:user", array(elgg_get_page_owner()->name)),
+	"pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
 
 $title = $pages->title . ": " . elgg_echo("pages:history");
 $content = elgg_view_title($title);
@@ -36,4 +37,4 @@ $sidebar = elgg_view('pages/sidebar/tree');
 
 $body = elgg_view_layout('one_column_with_sidebar', $content, $sidebar);
 
-echo elgg_view_page($title, $body);
\ No newline at end of file
+echo elgg_view_page($title, $body);
diff --git a/mod/pages/index.php b/mod/pages/index.php
index e3d440692..31f76f625 100644
--- a/mod/pages/index.php
+++ b/mod/pages/index.php
@@ -12,7 +12,7 @@ global $CONFIG;
 // Add menus
 $owner = elgg_get_page_owner();
 if (!($owner instanceof ElggGroup)) {
-		add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
+		add_submenu_item(elgg_echo("pages:user", array(elgg_get_page_owner()->name)), "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
 		add_submenu_item(elgg_echo('pages:all'), "mod/pages/world.php", 'pageslinksgeneral');
 }
 	if (($owner instanceof ElggEntity) && (can_write_to_container(0,$owner->guid))){
@@ -27,9 +27,9 @@ $limit = get_input("limit", 10);
 $offset = get_input("offset", 0);
 
 if($owner instanceof ElggGroup){
-	$title = sprintf(elgg_echo("pages:group"),$owner->name);
+	$title = elgg_echo("pages:group",array($owner->name));
 }else{
-	$title = sprintf(elgg_echo("pages:user"),$owner->name);
+	$title = elgg_echo("pages:user",array($owner->name));
 }
 
 
diff --git a/mod/pages/new.php b/mod/pages/new.php
index 0d467d449..af1443d0a 100644
--- a/mod/pages/new.php
+++ b/mod/pages/new.php
@@ -28,7 +28,7 @@ if(get_input('parent_guid')){
 	}
 
 	global $CONFIG;
-add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
+add_submenu_item(elgg_echo("pages:user", array(elgg_get_page_owner()->name)), "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
 
 $title = elgg_echo("pages:new");
 $area2 .= elgg_view_title($title);
diff --git a/mod/pages/start.php b/mod/pages/start.php
index 0f0af0a80..074e2a771 100644
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -86,7 +86,7 @@ function pages_submenus() {
 	// Group submenu option
 		if ($page_owner instanceof ElggGroup && elgg_get_context() == 'groups') {
 			if($page_owner->pages_enable != "no"){
-				add_submenu_item(sprintf(elgg_echo("pages:group"),$page_owner->name), "pg/pages/owned/" . $page_owner->username);
+				add_submenu_item(elgg_echo("pages:group", array($page_owner->name)), "pg/pages/owned/" . $page_owner->username);
 			}
 		}
 }
diff --git a/mod/pages/view.php b/mod/pages/view.php
index 2600de5c8..83b8d69c1 100644
--- a/mod/pages/view.php
+++ b/mod/pages/view.php
@@ -28,7 +28,6 @@ if ($container) {
 }
 
 global $CONFIG;
-// add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
 
 if ($pages->canEdit()) {
 	add_submenu_item(elgg_echo('pages:newchild'), "pg/pages/new/?parent_guid={$pages->getGUID()}&container_guid=" . elgg_get_page_owner_guid(), 'pagesactions');
diff --git a/mod/pages/views/default/annotation/page.php b/mod/pages/views/default/annotation/page.php
index cc0f67746..53f38831f 100644
--- a/mod/pages/views/default/annotation/page.php
+++ b/mod/pages/views/default/annotation/page.php
@@ -18,8 +18,8 @@ $icon = elgg_view(
 $owner_guid = $annotation->owner_guid;
 $owner = get_entity($owner_guid);
 
-$rev = sprintf(elgg_echo('pages:revision'),
-	elgg_view_friendly_time($annotation->time_created),
+$rev = elgg_echo('pages:revision',
+	array(elgg_view_friendly_time($annotation->time_created)),
 	"<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"
 );
 
diff --git a/mod/pages/views/default/pages/pagelisting.php b/mod/pages/views/default/pages/pagelisting.php
index 419fc8d23..0c4a411fb 100644
--- a/mod/pages/views/default/pages/pagelisting.php
+++ b/mod/pages/views/default/pages/pagelisting.php
@@ -23,8 +23,8 @@ if ($latest) {
 	$owner = get_entity($owner_guid);
 
 
-	$info .= "<p class=\"owner_timestamp\">".sprintf(elgg_echo("pages:strapline"),
-					elgg_view_friendly_time($time_updated),
+	$info .= "<p class=\"owner_timestamp\">" . elgg_echo("pages:strapline",
+					array(elgg_view_friendly_time($time_updated)),
 					"<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"
 	) . "</p>";
 }
diff --git a/mod/pages/views/default/pages/pageprofile.php b/mod/pages/views/default/pages/pageprofile.php
index 5702ec415..7008e668c 100644
--- a/mod/pages/views/default/pages/pageprofile.php
+++ b/mod/pages/views/default/pages/pageprofile.php
@@ -62,8 +62,8 @@ if ($rev) {
 			$owner_guid = $latest->owner_guid;
 			$owner = get_entity($owner_guid);
 
-			echo sprintf(elgg_echo("pages:strapline"),
-							elgg_view_friendly_time($time_updated),
+			echo elgg_echo("pages:strapline",
+							array(elgg_view_friendly_time($time_updated)),
 							"<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>"
 			);
 
diff --git a/mod/pages/views/default/pages/welcome.php b/mod/pages/views/default/pages/welcome.php
index 7802fa5af..7dbc6109a 100644
--- a/mod/pages/views/default/pages/welcome.php
+++ b/mod/pages/views/default/pages/welcome.php
@@ -11,6 +11,6 @@ if($vars['entity']) {
 	}
 } else {
 ?>
-<div class="contentWrapper pageswelcome"><p><?php echo sprintf(elgg_echo('pages:welcomemessage'), $vars['config']->sitename); ?></p></div>
+<div class="contentWrapper pageswelcome"><p><?php echo elgg_echo('pages:welcomemessage', array($vars['config']->sitename)); ?></p></div>
 <?php
 }
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
diff --git a/mod/pages/welcome.php b/mod/pages/welcome.php
index 4386c5228..7a2a43abd 100644
--- a/mod/pages/welcome.php
+++ b/mod/pages/welcome.php
@@ -24,7 +24,7 @@ if ($page_owner === false || is_null($page_owner)) {
 //get the owners welcome message if it exists
 $welcome_message = elgg_get_entities(array('types' => 'object', 'subtypes' => 'pages_welcome', 'container_guid' => $page_owner->getGUID(), 'limit' => 1));
 global $CONFIG;
-add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
+add_submenu_item(elgg_echo("pages:user", array(elgg_get_page_owner()->name)), "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
 
 $title = elgg_echo("pages:welcome");
 $area2 .= elgg_view_title($title);
diff --git a/mod/pages/world.php b/mod/pages/world.php
index 25081e00d..35a17b1e6 100644
--- a/mod/pages/world.php
+++ b/mod/pages/world.php
@@ -21,7 +21,7 @@ if (($page_owner instanceof ElggEntity) && ($page_owner->canWriteToContainer()))
 }
 
 if(isloggedin()) {
-	add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
+	add_submenu_item(elgg_echo("pages:user", array(elgg_get_page_owner()->name)), "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
 }
 
 add_submenu_item(elgg_echo('pages:all'), "mod/pages/world.php", 'pageslinksgeneral');
@@ -29,7 +29,7 @@ add_submenu_item(elgg_echo('pages:all'), "mod/pages/world.php", 'pageslinksgener
 $limit = get_input("limit", 10);
 $offset = get_input("offset", 0);
 
-$title = sprintf(elgg_echo("pages:all"),elgg_get_page_owner()->name);
+$title = elgg_echo("pages:all",array(elgg_get_page_owner()->name));
 
 // Get objects
 elgg_push_context('search');