From fa1f6d7454edcb8e30b9b0bdb14f1ec040546715 Mon Sep 17 00:00:00 2001
From: marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 6 Oct 2008 16:25:28 +0000
Subject: Closes #402 and #407 : Right! Finally nailed this fscking issue to
 the wall (hopefully).

Modified system log to hold extra information about the class being stored, this lets us pull only the required rows from the event log.

This drastically simplifies and speeds up the query.

Requires: Database upgrade.
Outstanding issues: Query is using filesort despite using correct index. Still much faster than the last method!

git-svn-id: https://code.elgg.org/elgg/trunk@2194 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/river/ElggRelationship/create.php    | 47 ----------------------
 views/default/river/relationship/friend/create.php | 47 ++++++++++++++++++++++
 2 files changed, 47 insertions(+), 47 deletions(-)
 delete mode 100644 views/default/river/ElggRelationship/create.php
 create mode 100644 views/default/river/relationship/friend/create.php

(limited to 'views/default')

diff --git a/views/default/river/ElggRelationship/create.php b/views/default/river/ElggRelationship/create.php
deleted file mode 100644
index edbaf4213..000000000
--- a/views/default/river/ElggRelationship/create.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-	/**
-	 * Elgg relationship create event.
-	 * Display something in the river when a relationship is created.
-	 * 
-	 * @package Elgg
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008
-	 * @link http://elgg.com/
-	 */
-
-	$statement = $vars['statement'];
-	
-	$performed_by = $statement->getSubject();
-	$event = $statement->getEvent();
-	$object = $statement->getObject();
-	
-	if (is_array($object))
-	{
-		switch ($object['relationship'])
-		{
-			// Friending
-			case 'friend' :
-			case 'friends' : // 'friends' shouldn't be used, but just incase :)
-				
-				// Get second object
-				$userb = $object['object'];
-				
-				// Only users can be friends
-				if (($performed_by instanceof ElggUser) && ($userb instanceof ElggUser))
-				{
-					// User A
-					echo "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a> ";
-				
-					// Verb
-					echo elgg_echo('river:relationship:friend');
-				
-					// user B
-					echo " <a href=\"{$userb->getURL()}\">{$userb->name}</a>";
-				}
-				
-			break;
-		}
-	}
-		
-?>
\ No newline at end of file
diff --git a/views/default/river/relationship/friend/create.php b/views/default/river/relationship/friend/create.php
new file mode 100644
index 000000000..edbaf4213
--- /dev/null
+++ b/views/default/river/relationship/friend/create.php
@@ -0,0 +1,47 @@
+<?php
+	/**
+	 * Elgg relationship create event.
+	 * Display something in the river when a relationship is created.
+	 * 
+	 * @package Elgg
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.com/
+	 */
+
+	$statement = $vars['statement'];
+	
+	$performed_by = $statement->getSubject();
+	$event = $statement->getEvent();
+	$object = $statement->getObject();
+	
+	if (is_array($object))
+	{
+		switch ($object['relationship'])
+		{
+			// Friending
+			case 'friend' :
+			case 'friends' : // 'friends' shouldn't be used, but just incase :)
+				
+				// Get second object
+				$userb = $object['object'];
+				
+				// Only users can be friends
+				if (($performed_by instanceof ElggUser) && ($userb instanceof ElggUser))
+				{
+					// User A
+					echo "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a> ";
+				
+					// Verb
+					echo elgg_echo('river:relationship:friend');
+				
+					// user B
+					echo " <a href=\"{$userb->getURL()}\">{$userb->name}</a>";
+				}
+				
+			break;
+		}
+	}
+		
+?>
\ No newline at end of file
-- 
cgit v1.2.3