Merge branch 'stable-3.1'

Marius Burkard

2016-03-02 2f74cf27ad6fbb852df78bcccca1fb645c8a57e0

 interface/web/nav.php

@@ -74,7 +74,7 @@
               $language = (isset($_SESSION['s']['user']['language']))?$_SESSION['s']['user']['language']:$conf['language'];
               $app->load_language_file('web/'.$mt.'/lib/'.$language.'.lng');
               $active = ($module['name'] == $_SESSION['s']['module']['name']) ? 1 : 0;
               $topnav[$module['order']] = array( 'title'  => $app->lng($module['title']),
               $topnav[$module['order'].'-'.$module['name']] = array( 'title'  => $app->lng($module['title']),
                  'active'  => $active,
                  'module' => $module['name']);
            }
@@ -83,12 +83,16 @@
      }
   } else {
      //*  Loading Login Module
      /*
      include_once 'login/lib/module.conf.php';
      $_SESSION['s']['module'] = $module;
      $topnav[] = array( 'title'  => 'Login',
         'active'  => 1);
      $module = null;
      unset($module);
      */
      header('Location: /login/');
      die();
   }

   //* Topnavigation