Reverted array_merge change

Marius Cramer

2013-11-21 7b35164b46ca67cd1dfa43bba583aa90106a5d8b

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