diff options
author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-03 22:13:10 +0000 |
---|---|---|
committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-03 22:13:10 +0000 |
commit | eff4faea7f3c95440f02ea45d0be4f67236e2bf3 (patch) | |
tree | 57d51ef4bc84547d60c9a6faae7d5ff5d82d00f9 /mod/profile/views | |
parent | 4b501dda1d62195531e4c2ab1bd84971c0cd4e37 (diff) | |
download | elgg-eff4faea7f3c95440f02ea45d0be4f67236e2bf3.tar.gz elgg-eff4faea7f3c95440f02ea45d0be4f67236e2bf3.tar.bz2 |
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
Diffstat (limited to 'mod/profile/views')
4 files changed, 11 insertions, 11 deletions
diff --git a/mod/profile/views/default/profile/profile_navigation.php b/mod/profile/views/default/profile/profile_navigation.php index b441b949f..a27cf789d 100755 --- a/mod/profile/views/default/profile/profile_navigation.php +++ b/mod/profile/views/default/profile/profile_navigation.php @@ -8,7 +8,7 @@ if (isset($vars['section'])) { $user = $vars['entity']; if (!$user) { // no user so no profile - echo sprintf(elgg_echo('viewfailure'), __FILE__); + echo elgg_echo('viewfailure', array(__FILE__)); return TRUE; } @@ -20,7 +20,7 @@ $twitter = ''; $url = "{$user->getURL()}/"; -//select section +//select section switch($section){ case 'friends': $friends = 'class="selected"'; @@ -35,7 +35,7 @@ switch($section){ case 'twitter': $twitter = 'class="selected"'; break; - + case 'commentwall': $commentwall = 'class="selected"'; break; @@ -60,7 +60,7 @@ switch($section){ <li <?php echo $twitter; ?>><a href="<?php echo $url . 'twitter'; ?>">Twitter</a></li> <?php } - + //insert a view which others can extend echo elgg_view('profile_navigation/extend', array('entity' => $user)); ?> diff --git a/mod/profile/views/default/profile/profile_ownerblock.php b/mod/profile/views/default/profile/profile_ownerblock.php index fd3ff6b11..bfed3aec1 100755 --- a/mod/profile/views/default/profile/profile_ownerblock.php +++ b/mod/profile/views/default/profile/profile_ownerblock.php @@ -16,7 +16,7 @@ if ($vars['entity']) { } if (!$user) { // no user so we quit view - echo sprintf(elgg_echo('viewfailure'), __FILE__); + echo elgg_echo('viewfailure', array(__FILE__)); return TRUE; } diff --git a/mod/profile/views/default/river/user/default/profileiconupdate.php b/mod/profile/views/default/river/user/default/profileiconupdate.php index b1e5baf88..9e617573b 100644 --- a/mod/profile/views/default/river/user/default/profileiconupdate.php +++ b/mod/profile/views/default/river/user/default/profileiconupdate.php @@ -1,8 +1,8 @@ <?php $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); - + $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $string = sprintf(elgg_echo("profile:river:update"),$url) ." <span class='entity_subtext'>" . elgg_view_friendly_time($vars['item']->posted) . "</span>"; - + $string = elgg_echo("profile:river:update", array($url)) ." <span class='entity_subtext'>" . elgg_view_friendly_time($vars['item']->posted) . "</span>"; + echo $string;
\ No newline at end of file diff --git a/mod/profile/views/default/river/user/default/profileupdate.php b/mod/profile/views/default/river/user/default/profileupdate.php index 5da11c4b3..156aa8b1b 100644 --- a/mod/profile/views/default/river/user/default/profileupdate.php +++ b/mod/profile/views/default/river/user/default/profileupdate.php @@ -1,10 +1,10 @@ <?php $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); - + $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $string = sprintf(elgg_echo("profile:river:update"),$url) ." <span class='entity_subtext'>" . elgg_view_friendly_time($vars['item']->posted) . "</span>"; - + $string = elgg_echo("profile:river:update", array($url)) ." <span class='entity_subtext'>" . elgg_view_friendly_time($vars['item']->posted) . "</span>"; + ?> <?php echo $string; ?>
\ No newline at end of file |