pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'dev' of https://github.com/nicofrand/poche into dev

Browse Source
This commit is contained in:
Nicolas Frandeboeuf
2013-08-22 00:57:11 +02:00
parent 2bf93dc034 746f93c290
commit 57c91e427d
7 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
inc/poche/config.inc.php
View File

@ -15,9 +15,9 @@ if (!file_exists(__DIR__ . '/../../vendor/autoload.php')) {
die('Twig does not seem installed. Have a look at <a href="http://inthepoche.com/?pages/Documentation">the documentation.</a>');
}
if (file_exists(__DIR__ . '/../../inc/poche/myconfig.inc.php')) {
require_once __DIR__ . '/../../inc/poche/myconfig.inc.php';
}
// if (file_exists(__DIR__ . '/../../inc/poche/myconfig.inc.php')) {
// require_once __DIR__ . '/../../inc/poche/myconfig.inc.php';
// }
require_once __DIR__ . '/../../inc/poche/User.class.php';
require_once __DIR__ . '/../../inc/poche/Url.class.php';
require_once __DIR__ . '/../../inc/3rdparty/class.messages.php';

2
inc/poche/define.inc.php
View File

@ -22,6 +22,8 @@ define ('REVERT_FORCED_PARAGRAPH_ELEMENTS', FALSE);
define ('DOWNLOAD_PICTURES', FALSE);
define ('SHARE_TWITTER', TRUE);
define ('SHARE_MAIL', TRUE);
define ('SHARE_SHAARLI', TRUE);
define ('SHAARLI_URL', 'http://myshaarliurl.com');
define ('ABS_PATH', 'assets/');
define ('TPL', __DIR__ . '/../../tpl');
define ('LOCALE', __DIR__ . '/../../locale');