fix bug #148 Use of undefined constant POCHE_VERSION

diff --git a/inc/poche/config.inc.php b/inc/poche/config.inc.php
index 4122ff102d0d5ab6ee780468d642080fa55053fb..cb882cd0246ffe9e8273e8e519d74bbdeffcd7ba 100755 (executable)
--- 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 c32ca0981b37b3f73f4d0a156fafb670a4d14560..80d1f29d386f66d9fd0397b567baa24438a2b228 100644 (file)
--- 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');

diff --git a/index.php b/index.php
index 51a33d71380b33c298e4e1f60c3d51905ecb7fed..5f43b7400c007887e94fe364bb66aabb78635499 100644 (file)
--- a/index.php
+++ b/index.php
@@ -8,6 +8,9 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
+if (file_exists(__DIR__ . '/inc/poche/myconfig.inc.php')) {
+    require_once __DIR__ . '/inc/poche/myconfig.inc.php';
+}
 require_once './inc/poche/Tools.class.php';
 Tools::createMyConfig();