aboutsummaryrefslogtreecommitdiffhomepage
path: root/inc/poche
diff options
context:
space:
mode:
authorNicolas Frandeboeuf <nicofrand@gmail.com>2013-08-22 00:57:11 +0200
committerNicolas Frandeboeuf <nicofrand@gmail.com>2013-08-22 00:57:11 +0200
commit57c91e427d20d520bc506bef52189a86d72a9255 (patch)
tree43fbcf6eac2fc1a913c796a5631a7ba874af9693 /inc/poche
parent2bf93dc0345e304656ed9a931f9941fd7117ddfe (diff)
parent746f93c290881d97997b8179395de2875eb57c71 (diff)
downloadwallabag-57c91e427d20d520bc506bef52189a86d72a9255.tar.gz
wallabag-57c91e427d20d520bc506bef52189a86d72a9255.tar.zst
wallabag-57c91e427d20d520bc506bef52189a86d72a9255.zip
Merge branch 'dev' of https://github.com/nicofrand/poche into dev
Diffstat (limited to 'inc/poche')
-rwxr-xr-xinc/poche/config.inc.php6
-rw-r--r--inc/poche/define.inc.php2
2 files changed, 5 insertions, 3 deletions
diff --git a/inc/poche/config.inc.php b/inc/poche/config.inc.php
index 4122ff10..cb882cd0 100755
--- a/inc/poche/config.inc.php
+++ b/inc/poche/config.inc.php
@@ -15,9 +15,9 @@ if (!file_exists(__DIR__ . '/../../vendor/autoload.php')) {
15 die('Twig does not seem installed. Have a look at <a href="http://inthepoche.com/?pages/Documentation">the documentation.</a>'); 15 die('Twig does not seem installed. Have a look at <a href="http://inthepoche.com/?pages/Documentation">the documentation.</a>');
16} 16}
17 17
18if (file_exists(__DIR__ . '/../../inc/poche/myconfig.inc.php')) { 18// if (file_exists(__DIR__ . '/../../inc/poche/myconfig.inc.php')) {
19 require_once __DIR__ . '/../../inc/poche/myconfig.inc.php'; 19 // require_once __DIR__ . '/../../inc/poche/myconfig.inc.php';
20} 20// }
21require_once __DIR__ . '/../../inc/poche/User.class.php'; 21require_once __DIR__ . '/../../inc/poche/User.class.php';
22require_once __DIR__ . '/../../inc/poche/Url.class.php'; 22require_once __DIR__ . '/../../inc/poche/Url.class.php';
23require_once __DIR__ . '/../../inc/3rdparty/class.messages.php'; 23require_once __DIR__ . '/../../inc/3rdparty/class.messages.php';
diff --git a/inc/poche/define.inc.php b/inc/poche/define.inc.php
index c32ca098..80d1f29d 100644
--- a/inc/poche/define.inc.php
+++ b/inc/poche/define.inc.php
@@ -22,6 +22,8 @@ define ('REVERT_FORCED_PARAGRAPH_ELEMENTS', FALSE);
22define ('DOWNLOAD_PICTURES', FALSE); 22define ('DOWNLOAD_PICTURES', FALSE);
23define ('SHARE_TWITTER', TRUE); 23define ('SHARE_TWITTER', TRUE);
24define ('SHARE_MAIL', TRUE); 24define ('SHARE_MAIL', TRUE);
25define ('SHARE_SHAARLI', TRUE);
26define ('SHAARLI_URL', 'http://myshaarliurl.com');
25define ('ABS_PATH', 'assets/'); 27define ('ABS_PATH', 'assets/');
26define ('TPL', __DIR__ . '/../../tpl'); 28define ('TPL', __DIR__ . '/../../tpl');
27define ('LOCALE', __DIR__ . '/../../locale'); 29define ('LOCALE', __DIR__ . '/../../locale');