summaryrefslogtreecommitdiff
path: root/install.php
diff options
context:
space:
mode:
authorSavetheinternet <savetheinternet@tinyboard.org>2011-06-16 03:45:40 +1000
committerSavetheinternet <savetheinternet@tinyboard.org>2011-06-16 03:45:40 +1000
commitda86c76165398bfa8a29c8bd78a1dd157c561737 (patch)
tree13bc79b44d29f64782ead81a4ae8b2e5a298ef04 /install.php
parent05521c357904ff7c9e0b10f574db9df8ab5510e3 (diff)
Revert ""Are you sure you want to continue" message when pre-installation test failed"
This reverts commit 38aec8b852fc52ab63fca3f36b1e4dcc3054e051.
Diffstat (limited to 'install.php')
-rwxr-xr-xinstall.php9
1 files changed, 3 insertions, 6 deletions
diff --git a/install.php b/install.php
index a9e6b2e6..b05016fb 100755
--- a/install.php
+++ b/install.php
@@ -117,9 +117,8 @@
}
function row($item, $result) {
- global $page, $config, $__is_error;
- if(!$result)
- $__is_error = true;
+ global $page, $config;
+
$page['body'] .= '<tr><th>' . $item . '</th><td><img style="width:16px;height:16px" src="' . $config['dir']['static'] . ($result ? 'ok.png' : 'error.png') . '" /></td></tr>';
}
@@ -150,9 +149,7 @@
$page['body'] .= '</table>
<p style="text-align:center">
- <a href="?step=2"' .
- (isset($__is_error) ? ' onclick="return confirm(\'Are you sure you want to continue when errors exist?\')"' : '') .
- '>Continue' . (isset($__is_error) ? ' anyway' : '') . '.</a>
+ <a href="?step=2">Continue.</a>
</p>';
echo Element('page.html', $page);