aboutsummaryrefslogtreecommitdiff
path: root/mod/profile
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-03 22:13:10 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-03 22:13:10 +0000
commiteff4faea7f3c95440f02ea45d0be4f67236e2bf3 (patch)
tree57d51ef4bc84547d60c9a6faae7d5ff5d82d00f9 /mod/profile
parent4b501dda1d62195531e4c2ab1bd84971c0cd4e37 (diff)
downloadelgg-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')
-rw-r--r--mod/profile/actions/addcomment.php33
-rw-r--r--mod/profile/actions/edit.php4
-rwxr-xr-xmod/profile/views/default/profile/profile_navigation.php8
-rwxr-xr-xmod/profile/views/default/profile/profile_ownerblock.php2
-rw-r--r--mod/profile/views/default/river/user/default/profileiconupdate.php6
-rw-r--r--mod/profile/views/default/river/user/default/profileupdate.php6
6 files changed, 29 insertions, 30 deletions
diff --git a/mod/profile/actions/addcomment.php b/mod/profile/actions/addcomment.php
index 5817b8e83..07f72ef8e 100644
--- a/mod/profile/actions/addcomment.php
+++ b/mod/profile/actions/addcomment.php
@@ -5,44 +5,43 @@
// Make sure we're logged in; forward to the front page if not
if (!isloggedin()) forward();
-
+
// Get input
$message_content = get_input('message_content'); // the actual message
$page_owner = get_input("pageOwner"); // the message board owner
$message_owner = get_input("guid"); // the user posting the message
$user = get_entity($page_owner); // the commentwall owner details
-
+
// Let's see if we can get a user entity from the specified page_owner
if ($user && !empty($message_content)) {
-
+
// If posting the comment was successful, say so
if ($user->annotate('commentwall',$message_content,$user->access_id, get_loggedin_userid())) {
-
+
global $CONFIG;
-
+
if ($user->getGUID() != get_loggedin_userid())
- notify_user($user->getGUID(), get_loggedin_userid(), elgg_echo('profile:comment:subject'),
- sprintf(
- elgg_echo('profile:comment:body'),
+ notify_user($user->getGUID(), get_loggedin_userid(), elgg_echo('profile:comment:subject'),
+ elgg_echo('profile:comment:body', array(
get_loggedin_user()->name,
$message_content,
elgg_get_site_url() . "pg/profile/" . $user->username,
get_loggedin_user()->name,
get_loggedin_user()->getURL()
- )
- );
-
- system_message(elgg_echo("profile:commentwall:posted"));
- // add to river
- add_to_river('river/object/profile/commentwall/create','commentwall',get_loggedin_userid(),$user->guid);
-
+ ))
+ );
+
+ system_message(elgg_echo("profile:commentwall:posted"));
+ // add to river
+ add_to_river('river/object/profile/commentwall/create','commentwall',get_loggedin_userid(),$user->guid);
+
} else {
register_error(elgg_echo("profile:commentwall:failure"));
}
-
+
} else {
register_error(elgg_echo("profile:commentwall:blank"));
}
-
+
// Forward back to the messageboard
forward(REFERER); \ No newline at end of file
diff --git a/mod/profile/actions/edit.php b/mod/profile/actions/edit.php
index c91e5e5a7..f3c928cef 100644
--- a/mod/profile/actions/edit.php
+++ b/mod/profile/actions/edit.php
@@ -46,7 +46,7 @@ foreach($CONFIG->profile as $shortname => $valuetype) {
// limit to reasonable sizes.
if (!is_array($value) && $valuetype != 'longtext' && elgg_strlen($value) > 250) {
- $error = sprintf(elgg_echo('profile:field_too_long'), elgg_echo("profile:{$shortname}"));
+ $error = elgg_echo('profile:field_too_long', array(elgg_echo("profile:{$shortname}")));
register_error($error);
forward(REFERER);
}
@@ -103,7 +103,7 @@ if (sizeof($input) > 0) {
//add to river if edited by self
if (get_loggedin_userid() == $user->guid) {
add_to_river('river/user/default/profileupdate','update',get_loggedin_userid(),get_loggedin_userid(),get_default_access(get_loggedin_user()));
- }
+ }
system_message(elgg_echo("profile:saved"));
}
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