Merge branch 'master' into 'master'

Marius Cramer

2015-11-12 8ce5e3054e6bc70cc44e8d2d002ac035f02bd9ec

 interface/web/login/index.php

@@ -351,6 +351,12 @@
// Title
$app->tpl->setVar('company_name', $sys_config['company_name']. ' :: ');

// Custom Login
if ($sys_config['custom_login_text'] != '') {
    $custom_login = @($sys_config['custom_login_link'] != '')?'<a href="'.$sys_config['custom_login_link'].'" target="_blank">'.$sys_config['custom_login_text'].'</a>':$sys_config['custom_login_text'];
}
$app->tpl->setVar('custom_login', $custom_login);

$app->tpl_defaults();

$app->tpl->pparse();