fix bug #225: blank page on article page

[github/wallabag/wallabag.git] / inc / poche / Poche.class.php

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 67fbd5290d7927247cfe1708f3f8479d28c4724b..561de808d562b4938f9516770984203410adfbc7 100644 (file)
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -150,7 +150,7 @@ class Poche
             $msg = '<h1>error</h1><p>You don\'t have write access on cache directory.</p>';
         } else if (STORAGE == 'sqlite' && ! file_exists(STORAGE_SQLITE)) {
             Tools::logm('sqlite file doesn\'t exist');
-            $msg = '<h1>error</h1><p>sqlite file doesn\'t exist, you can find it in install folder.</p>';
+            $msg = '<h1>error</h1><p>sqlite file doesn\'t exist, you can find it in install folder. Copy it in /db folder.</p>';
         } else if (file_exists(ROOT . '/install/update.php') && ! DEBUG_POCHE) {
             $msg = '<h1>setup</h1><p><strong>It\'s your first time here?</strong> Please copy /install/poche.sqlite in db folder. Then, delete install folder.<br /><strong>If you have already installed poche</strong>, an update is needed <a href="install/update.php">by clicking here</a>.</p>';
         } else if (is_dir(ROOT . '/install') && ! DEBUG_POCHE) {
@@ -381,17 +381,17 @@ class Poche
                         $tidy = tidy_parse_string($content, array('indent'=>true, 'show-body-only' => true), 'UTF8');
                         $tidy->cleanRepair();
                         $content = $tidy->value;
+                    }
 
-                        # flattr checking
-                        $flattr = new FlattrItem();
-                        $flattr->checkItem($entry['url']);
+                    # flattr checking
+                    $flattr = new FlattrItem();
+                    $flattr->checkItem($entry['url']);
 
-                        $tpl_vars = array(
-                        'entry' => $entry,
-                        'content' => $content,
-                        'flattr' => $flattr
-                        );
-                    }
+                    $tpl_vars = array(
+                    'entry' => $entry,
+                    'content' => $content,
+                    'flattr' => $flattr
+                    );
                 }
                 else {
                     Tools::logm('error in view call : entry is null');