aboutsummaryrefslogtreecommitdiffhomepage
path: root/index.php
diff options
context:
space:
mode:
authortcit <tcit@tcit.fr>2014-05-16 16:31:18 +0200
committertcit <tcit@tcit.fr>2014-05-16 16:31:18 +0200
commit404adf970d985da0f624c42a5aa5e9c63694b08d (patch)
treeab298f6d6687dcef7494d7bd938dcdaac80a48fc /index.php
parent74e09e562ba46c52da364539aa4fc0414114ca87 (diff)
parentf3f0b11393dd7f11bc1e63df9488c3930c0bc06f (diff)
downloadwallabag-404adf970d985da0f624c42a5aa5e9c63694b08d.tar.gz
wallabag-404adf970d985da0f624c42a5aa5e9c63694b08d.tar.zst
wallabag-404adf970d985da0f624c42a5aa5e9c63694b08d.zip
Merge branch 'epub' into dev
Conflicts: themes/baggy/home.twig
Diffstat (limited to 'index.php')
-rwxr-xr-xindex.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/index.php b/index.php
index 9c943b1d..79838ed9 100755
--- a/index.php
+++ b/index.php
@@ -70,6 +70,8 @@ if (isset($_GET['login'])) {
70 $poche->createNewUser(); 70 $poche->createNewUser();
71} elseif (isset($_GET['deluser'])) { 71} elseif (isset($_GET['deluser'])) {
72 $poche->deleteUser(); 72 $poche->deleteUser();
73} elseif (isset($_GET['epub'])) {
74 $poche->createEpub();
73} elseif (isset($_GET['import'])) { 75} elseif (isset($_GET['import'])) {
74 $import = $poche->import(); 76 $import = $poche->import();
75 $tpl_vars = array_merge($tpl_vars, $import); 77 $tpl_vars = array_merge($tpl_vars, $import);