Merge Elgg 1.8.3.

2 files changed, 13 insertions, 1 deletions

diff --git a/mod/profile/icondirect.php b/mod/profile/icondirect.php
index f7188455e..6c3148f2b 100644
--- a/mod/profile/icondirect.php
+++ b/mod/profile/icondirect.php
@@ -12,8 +12,16 @@ require_once(dirname(dirname(dirname(__FILE__))). '/engine/settings.php');
 global $CONFIG;
 
 $join_date = (int)$_GET['joindate'];
+$last_cache = (int)$_GET['lastcache']; // icontime
 $guid = (int)$_GET['guid'];
 
+// If is the same ETag, content didn't changed.
+$etag = $last_cache . $guid;
+if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && trim($_SERVER['HTTP_IF_NONE_MATCH']) == $etag) {
+	header("HTTP/1.1 304 Not Modified");
+	exit;
+}
+
 $size = strtolower($_GET['size']);
 if (!in_array($size, array('large', 'medium', 'small', 'tiny', 'master', 'topbar'))) {
 	$size = "medium";
@@ -48,6 +56,7 @@ if ($mysql_dblink) {
 				header("Pragma: public");
 				header("Cache-Control: public");
 				header("Content-Length: " . strlen($contents));
+				header("ETag: $etag");
 				// this chunking is done for supposedly better performance
 				$split_string = str_split($contents, 1024);
 				foreach ($split_string as $chunk) {
diff --git a/mod/profile/views/default/profile/js.php b/mod/profile/views/default/profile/js.php
index 16dec59df..5a08a90bd 100644
--- a/mod/profile/views/default/profile/js.php
+++ b/mod/profile/views/default/profile/js.php
@@ -1,6 +1,9 @@
+
+// force the first column to at least be as large as the profile box in cols 2 and 3
+// we also want to run before the widget init happens so priority is < 500
 elgg.register_hook_handler('init', 'system', function() {
 	// only do this on the profile page's widget canvas.
 	if ($('.profile').length) {
 		$('#elgg-widget-col-1').css('min-height', $('.profile').outerHeight(true) + 1);
 	}
-});
\ No newline at end of file
+}, 400);