diff options
author | Tim Almdal <tnalmdal@shaw.ca> | 2009-06-29 06:44:05 -0700 |
---|---|---|
committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-06-29 06:44:05 -0700 |
commit | 10b4eda6f0cbb44fde9fb3158bd174c82467f2ee (patch) | |
tree | 811d72521d8ad7bfb361030c4d320aa03b17ddea /installer/index.php | |
parent | 42c82ef7f081630c15a5d354205896764348a76a (diff) | |
parent | b0bb107b7ebb5edbf3bec69ae2e716552eb1adf5 (diff) |
Merge branch 'master' of git@github.com:gallery/gallery3
Conflicts:
modules/gallery/libraries/Theme_View.php
themes/admin_default/views/admin.html.php
Diffstat (limited to 'installer/index.php')
-rw-r--r-- | installer/index.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/installer/index.php b/installer/index.php index 317f27b8..a11c0b02 100644 --- a/installer/index.php +++ b/installer/index.php @@ -30,10 +30,6 @@ require(DOCROOT . "installer/installer.php"); if (PHP_SAPI == "cli") { include("cli.php"); } else { - if (@$_GET["page"] == "check") { - include("check.html.php"); - } else { - include("web.php"); - } + include("web.php"); } |