aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mod/profile/actions/iconupload.php2
-rw-r--r--mod/profile/icon.php2
-rw-r--r--mod/profile/views/default/profile/icon.php8
3 files changed, 11 insertions, 1 deletions
diff --git a/mod/profile/actions/iconupload.php b/mod/profile/actions/iconupload.php
index a1e29b255..7c7e95f37 100644
--- a/mod/profile/actions/iconupload.php
+++ b/mod/profile/actions/iconupload.php
@@ -43,6 +43,8 @@
$filehandler->write($small);
$filehandler->close();
+ $_SESSION['user']->icontime = time();
+
system_message(elgg_echo("profile:icon:uploaded"));
} else {
diff --git a/mod/profile/icon.php b/mod/profile/icon.php
index efabe1d6d..65723a164 100644
--- a/mod/profile/icon.php
+++ b/mod/profile/icon.php
@@ -44,6 +44,8 @@
}
header("Content-type: image/jpeg");
+ header("Pragma: public");
+ header("Cache-Control: public");
echo $contents;
?> \ No newline at end of file
diff --git a/mod/profile/views/default/profile/icon.php b/mod/profile/views/default/profile/icon.php
index 036786715..3e96e7d97 100644
--- a/mod/profile/views/default/profile/icon.php
+++ b/mod/profile/views/default/profile/icon.php
@@ -19,6 +19,12 @@
$name = htmlentities($vars['entity']->name);
$username = $vars['entity']->username;
+
+ if ($icontime = $vars['entity']->icontime) {
+ $icontime = "{$icontime}";
+ } else {
+ $icontime = "default";
+ }
// Get size
if (!in_array($vars['size'],array('small','medium','large','tiny')))
@@ -33,4 +39,4 @@
?>
- <a href="<?php echo $vars['entity']->getURL(); ?>"><img src="<?php echo $vars['url']; ?>pg/icon/<?php echo $username; ?>/<?php echo $vars['size']; ?>/icon.jpg" border="0" <?php echo $align; ?> title="<?php echo $name; ?>" <?php echo $vars['js']; ?> /></a> \ No newline at end of file
+ <a href="<?php echo $vars['entity']->getURL(); ?>"><img src="<?php echo $vars['url']; ?>pg/icon/<?php echo $username; ?>/<?php echo $vars['size']; ?>/<?php echo $icontime; ?>.jpg" border="0" <?php echo $align; ?> title="<?php echo $name; ?>" <?php echo $vars['js']; ?> /></a> \ No newline at end of file