diff options
author | Thomas Citharel <tcit@tcit.fr> | 2014-10-08 21:32:03 +0200 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2014-10-08 21:32:03 +0200 |
commit | 1403af5be35a80b5420bd52ec42d376c4fa6c486 (patch) | |
tree | 18f2f7af607d0216215d4ba69c9658506c3ad45e /install | |
parent | a305326973d744b5e56e7cdfc140da1c7faaaba6 (diff) | |
parent | 20b4d7d621fd7e4d3078b9928fbf7643da64f08b (diff) | |
download | wallabag-1403af5be35a80b5420bd52ec42d376c4fa6c486.tar.gz wallabag-1403af5be35a80b5420bd52ec42d376c4fa6c486.tar.zst wallabag-1403af5be35a80b5420bd52ec42d376c4fa6c486.zip |
Merge pull request #861 from wallabag/fix-query-sqlite-install
query for populate mysql/postgres was called when we choosed sqlite
Diffstat (limited to 'install')
-rwxr-xr-x | install/index.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/install/index.php b/install/index.php index 00ac4a23..89dfc017 100755 --- a/install/index.php +++ b/install/index.php | |||
@@ -155,8 +155,10 @@ else if (isset($_POST['install'])) { | |||
155 | } | 155 | } |
156 | } | 156 | } |
157 | 157 | ||
158 | // create database structure | 158 | if ($_POST['db_engine'] != "sqlite") { |
159 | $query = $handle->exec($sql_structure); | 159 | // create database structure |
160 | $query = $handle->exec($sql_structure); | ||
161 | } | ||
160 | 162 | ||
161 | // Create user | 163 | // Create user |
162 | $handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); | 164 | $handle->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); |
@@ -254,7 +256,7 @@ else if (isset($_POST['install'])) { | |||
254 | <?php endif; ?> | 256 | <?php endif; ?> |
255 | <?php endif; ?> | 257 | <?php endif; ?> |
256 | <p>To install wallabag, you just have to fill the following fields. That's all.</p> | 258 | <p>To install wallabag, you just have to fill the following fields. That's all.</p> |
257 | <p>Don't forget to check your server compatibility <a href="wallabag_compatibility_test.php?from=install">here</a>.</p> | 259 | <p>Don't forget to check your server compatibility <a href="install/wallabag_compatibility_test.php?from=install">here</a>.</p> |
258 | <form method="post"> | 260 | <form method="post"> |
259 | <fieldset> | 261 | <fieldset> |
260 | <legend><strong>Technical settings</strong></legend> | 262 | <legend><strong>Technical settings</strong></legend> |