Merge branch 'cherry-pick-b0bdcbb3' into 'pandora_6.0'

Merge branch '80-pandora-en-windows-no-muestra-la-hora-en-el-footer' into 'develop'

See merge request !210
This commit is contained in:
vgilc 2017-03-15 11:17:22 +01:00
commit 23bf6e4f8e

View File

@ -29,7 +29,7 @@ if (! file_exists ($config["homedir"] . $license_file)) {
echo '<a class="white_bold footer" target="_blank" href="' . $config["homeurl"] . $license_file. '">';
echo sprintf(__('Pandora FMS %s - Build %s', $pandora_version, $build_version));
echo '</a><br />';
echo '<a class="white footer">'. __('Page generated at') . ' '. ui_print_timestamp ($time, true, array ("prominent" => "timestamp")); //Always use timestamp here
echo '<a class="white footer">'. __('Page generated at') . ' '. date('F j, Y h:i a'); //Always use timestamp here
echo '</a>';
if (isset ($config['debug'])) {
$cache_info = array();