merger

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index fb36330..d37f424 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -284,11 +284,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         } 
           
         $this->person_name = $au && !empty($au->name) ? $au->name : '';
-<<<<<<< Updated upstream
-        $this->person_id = $au ? $au->pid() : -1;
-=======
         $this->person_id = $au ? (!empty($au->id) ? $au->id : $au->pid()) : -1;
->>>>>>> Stashed changes
         $this->person_table = $au ? $au->tableName() : '';
         $this->ipaddr = isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : 'cli';
         if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {