Merge branch 'master' into 'master'

Marius Cramer

2014-01-24 20e30b45aaaf068b0391ff4679e4f44a0fae8d6e

 interface/lib/classes/auth.inc.php

@@ -33,6 +33,7 @@

   public function get_user_id()
   {
      global $app;
      return $app->functions->intval($_SESSION['s']['user']['userid']);
   }