# HG changeset patch
# User Dan
# Date 1262703360 18000
# Node ID c6587072e4c42d5e8ac2f9bd2b47cb4bcef9b799
# Parent 5d63267470cd0cc077c4f2a35a1c480239572927
Fixed ENANO_VERSION under databaseless template class
diff -r 5d63267470cd -r c6587072e4c4 includes/functions.php
--- a/includes/functions.php Tue Jan 05 09:55:21 2010 -0500
+++ b/includes/functions.php Tue Jan 05 09:56:00 2010 -0500
@@ -1358,6 +1358,10 @@
function enano_version($long = false, $no_nightly = false)
{
+ if ( !defined('ENANO_CONFIG_FETCHED') )
+ {
+ return function_exists('installer_enano_version') ? installer_enano_version() : $GLOBALS['enano_version'];
+ }
$r = getConfig('enano_version');
$rc = ( $long ) ? ' release candidate ' : 'RC';
$b = ( $long ) ? ' beta ' : 'b';
diff -r 5d63267470cd -r c6587072e4c4 includes/template.php
--- a/includes/template.php Tue Jan 05 09:55:21 2010 -0500
+++ b/includes/template.php Tue Jan 05 09:56:00 2010 -0500
@@ -3023,7 +3023,7 @@
{
$js_dynamic .= '';
}
- $js_dynamic .= '';
+ $js_dynamic .= '';
global $site_name, $site_desc;
$site_default_name = ( !empty($site_name) ) ? $site_name : 'Critical error';
@@ -3062,7 +3062,8 @@
'JS_DYNAMIC_VARS'=>$js_dynamic,
'SIDEBAR_RIGHT'=>'',
'REPORT_URI' => '',
- 'URL_ABOUT_ENANO' => 'http://enanocms.org/'
+ 'URL_ABOUT_ENANO' => 'http://enanocms.org/',
+ 'ENANO_VERSION' => enano_version()
);
$this->tpl_strings = array_merge($tpl_strings, $this->tpl_strings);