Merge branch 'master' into 'master'

Marius Cramer

2014-02-11 e2b4f760bb91caf66445a888c7a185e972e97a3c

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