From b05caab768f9e1c4cbef4af87670dc87ef4d529f Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Thu, 28 Jun 2012 21:52:30 -0400
Subject: Fixes #4634: Restores pre 1.7 group profile pics after update

---
 mod/groups/icon.php  |  6 ++++++
 mod/groups/start.php | 13 +++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'mod/groups')

diff --git a/mod/groups/icon.php b/mod/groups/icon.php
index f86f84fa5..1bd240ea6 100644
--- a/mod/groups/icon.php
+++ b/mod/groups/icon.php
@@ -8,7 +8,13 @@
 require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
 $group_guid = get_input('group_guid');
+
+/* @var ElggGroup $group */
 $group = get_entity($group_guid);
+if (!($group instanceof ElggGroup)) {
+	header("HTTP/1.1 404 Not Found");
+	exit;
+}
 
 // If is the same ETag, content didn't changed.
 $etag = $group->icontime . $group_guid;
diff --git a/mod/groups/start.php b/mod/groups/start.php
index c8198371b..d6c2a47d2 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -284,12 +284,21 @@ function groups_url($entity) {
  * @return string Relative URL
  */
 function groups_icon_url_override($hook, $type, $returnvalue, $params) {
+	/* @var ElggGroup $group */
 	$group = $params['entity'];
 	$size = $params['size'];
 
-	if (isset($group->icontime)) {
+	$icontime = $group->icontime;
+	// handle missing metadata (pre 1.7 installations)
+	if (null === $icontime) {
+		$file = new ElggFile();
+		$file->owner_guid = $group->owner_guid;
+		$file->setFilename("groups/" . $group->guid . "large.jpg");
+		$icontime = $file->exists() ? time() : 0;
+		create_metadata($group->guid, 'icontime', $icontime, 'integer', $group->owner_guid, ACCESS_PUBLIC);
+	}
+	if ($icontime) {
 		// return thumbnail
-		$icontime = $group->icontime;
 		return "groupicon/$group->guid/$size/$icontime.jpg";
 	}
 
-- 
cgit v1.2.3