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

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')) {
     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';
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);
 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');