Merge branch 'master' into 'master'

Marius Cramer

2014-02-14 e100328a7f3d495dfddf71f7c71f24ac14bfd9a0

 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']);
   }