aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/system_log.php
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-14 20:01:59 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-05-14 20:01:59 +0000
commitb6aaba915151dd07800761a01b67ffffaee1302b (patch)
tree53c30035411460270278943f2427405233b34fac /engine/lib/system_log.php
parentffbd7cd4179a0186dc674c2d24f578660cc75df0 (diff)
downloadelgg-b6aaba915151dd07800761a01b67ffffaee1302b.tar.gz
elgg-b6aaba915151dd07800761a01b67ffffaee1302b.tar.bz2
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
Diffstat (limited to 'engine/lib/system_log.php')
-rw-r--r--engine/lib/system_log.php2
1 files changed, 1 insertions, 1 deletions
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;