Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 21 Dec 2015 11:08:21 +0000 (12:08 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 21 Dec 2015 11:08:21 +0000 (12:08 +0100)
1  2 
tests/tine20/TestCase.php
tine20/Calendar/Backend/Sql.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/js/Model.js
tine20/Tinebase/AccessLog.php
tine20/Tinebase/Backend/Sql/Command/Pgsql.php
tine20/Tinebase/Config.php
tine20/Tinebase/Container.php
tine20/Tinebase/Controller.php

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -118,17 -187,15 +187,17 @@@ class Tinebase_AccessLog extends Tineba
       *
       * @param string $_sessionId the session id
       * @param string $_ipAddress the ip address the user connects from
-      * @return void|Tinebase_Model_AccessLog
+      * @return null|Tinebase_Model_AccessLog
       */
 -    public function setLogout($_sessionId)
 +    public function setLogout()
      {
 +        $sessionId = Tinebase_Core::getSessionId();
 +
          try {
 -            $loginRecord = $this->_backend->getByProperty($_sessionId, 'sessionid');
 +            $loginRecord = $this->_backend->getByProperty($sessionId, 'sessionid');
          } catch (Tinebase_Exception_NotFound $tenf) {
              Tinebase_Core::getLogger()->warn(__METHOD__ . '::' . __LINE__ . ' Could not find access log login record for session id ' . $_sessionId);
-             return;
+             return null;
          }
          
          $loginRecord->lo = Tinebase_DateTime::now();
Simple merge
Simple merge
Simple merge