From b6aaba915151dd07800761a01b67ffffaee1302b Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 14 May 2010 20:01:59 +0000
Subject: merge -r5898:5928 (not excluding riverdashboard, notifications, and
 messageboard) from 1.7 to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@6058 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/system_log.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engine/lib/system_log.php')

diff --git a/engine/lib/system_log.php b/engine/lib/system_log.php
index 75a7cc531..74597ed5d 100644
--- a/engine/lib/system_log.php
+++ b/engine/lib/system_log.php
@@ -203,7 +203,7 @@ function system_log($object, $event) {
 		$object_subtype = $object->getSubtype();
 		$event = sanitise_string($event);
 		$time = time();
-		$performed_by = (int)$_SESSION['guid'];
+		$performed_by = get_loggedin_userid();
 
 		if (isset($object->access_id)) {
 			$access_id = $object->access_id;
-- 
cgit v1.2.3