Merge branch 'admin-sections/4' into 0.9.x

[quix0rs-gnu-social.git] / lib / util.php

diff --git a/lib/util.php b/lib/util.php
index 4b2a25eadec5be9ebeac4d5abae357de3f1bfd4e..5bf4f6091bcf823182f050f57935a818de2ae179 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -196,10 +196,15 @@ function common_set_user($user)
     }
 
     if ($user) {
-        common_ensure_session();
-        $_SESSION['userid'] = $user->id;
-        $_cur = $user;
-        return $_cur;
+        if (Event::handle('StartSetUser', array(&$user))) {
+            if($user){
+                common_ensure_session();
+                $_SESSION['userid'] = $user->id;
+                $_cur = $user;
+                Event::handle('EndSetUser', array($user));
+                return $_cur;
+            }
+        }
     }
     return false;
 }
@@ -1058,7 +1063,6 @@ function common_log($priority, $msg, $filename=null)
         }
     } else {
         common_ensure_syslog();
-        error_log($msg);
         syslog($priority, $msg);
     }
 }