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/pages/views/default/annotation/page.php | 4 ++-- mod/pages/views/default/pages/pagelisting.php | 4 ++-- mod/pages/views/default/pages/pageprofile.php | 4 ++-- mod/pages/views/default/pages/welcome.php | 2 +- 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 +- 10 files changed, 13 insertions(+), 13 deletions(-) (limited to 'mod/pages/views/default') 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)), "getURL() . "\">" . $owner->name ."" ); 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 .= "

".sprintf(elgg_echo("pages:strapline"), - elgg_view_friendly_time($time_updated), + $info .= "

" . elgg_echo("pages:strapline", + array(elgg_view_friendly_time($time_updated)), "getURL() . "\">" . $owner->name ."" ) . "

"; } 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)), "getURL() . "\">" . $owner->name ."" ); 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 { ?> -

sitename); ?>

+

sitename)); ?>

getSubject(); $object = $statement->getObject(); $url = "getURL()}\">{$performed_by->name}"; -$string = sprintf(elgg_echo("pages:river:posted"),$url) . " "; +$string = elgg_echo("pages:river:posted", array($url)) . " "; $string .= "getURL() . "\">" . elgg_echo("pages:river:annotate:create") . " " . $object->title; //$string .= "
" . $object->title . "
"; 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 = "getURL()}\">{$performed_by->name}"; $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") . " getURL() . "\">" . $object->title . " ". elgg_view_friendly_time($object->time_created) ." Comment"; $string .= elgg_view('likes/forms/link', array('entity' => $object)); $string .= "
"; 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 = "getURL()}\">{$performed_by->name}"; -$string = sprintf(elgg_echo("pages:river:updated"),$url) . " "; +$string = elgg_echo("pages:river:updated", array($url)) . " "; $string .= elgg_echo("pages:river:update") . " getURL() . "\">" . $object->title . ""; 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 = "getURL()}\">{$performed_by->name}"; -$string = sprintf(elgg_echo("pages:river:posted"),$url) . " "; +$string = elgg_echo("pages:river:posted", array($url)) . " "; $string .= elgg_echo("pages:river:annotate:create") . " getURL() . "\">" . $object->title . ""; 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 = "getURL()}\">{$performed_by->name}"; -$string = sprintf(elgg_echo("pages:river:created"),$url) . " "; +$string = elgg_echo("pages:river:created", array($url)) . " "; $string .= elgg_echo("pages:river:create") . "getURL() . "\">" . $object->title . ""; 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 = "getURL()}\">{$performed_by->name}"; -$string = sprintf(elgg_echo("pages:river:updated"),$url) . " "; +$string = elgg_echo("pages:river:updated", array($url)) . " "; $string .= elgg_echo("pages:river:update") . " getURL() . "\">" . $object->title . ""; echo $string; \ No newline at end of file -- cgit v1.2.3