equal
deleted
inserted
replaced
31 'RC' => 'rc' |
31 'RC' => 'rc' |
32 ); |
32 ); |
33 $v = $installer_version['version']; |
33 $v = $installer_version['version']; |
34 if ( isset($installer_version['sub']) ) |
34 if ( isset($installer_version['sub']) ) |
35 { |
35 { |
36 $v .= ( $short ) ? $keywords[$installer_version['type']] : " {$installer_version['type']} "; |
36 $v .= ( !$long ) ? $keywords[$installer_version['type']] : " {$installer_version['type']} "; |
37 $v .= $installer_version['sub']; |
37 $v .= $installer_version['sub']; |
38 } |
38 } |
39 return $v; |
39 return $v; |
40 } |
40 } |
41 |
41 |
77 define('scriptPath', $sp); |
77 define('scriptPath', $sp); |
78 } |
78 } |
79 |
79 |
80 // is Enano already installed? |
80 // is Enano already installed? |
81 @include(ENANO_ROOT . '/config.php'); |
81 @include(ENANO_ROOT . '/config.php'); |
82 if ( defined('ENANO_INSTALLED') && defined('ENANO_DANGEROUS') ) |
82 if ( defined('ENANO_INSTALLED') && defined('ENANO_DANGEROUS') && !isset($_GET['debug_warn_php4']) ) |
83 { |
83 { |
84 $title = 'Installation locked'; |
84 $title = 'Installation locked'; |
85 require('includes/common.php'); |
85 require('includes/common.php'); |
86 $template->header(); |
86 $template->header(); |
87 echo '<p>The installer has detected that an installation of Enano already exists on your server. You MUST delete config.php if you wish to reinstall Enano.</p>'; |
87 echo '<p>The installer has detected that an installation of Enano already exists on your server. You MUST delete config.php if you wish to reinstall Enano.</p>'; |