]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'dev' of github.com:inthepoche/poche into dev
authorNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Fri, 23 Aug 2013 19:15:39 +0000 (21:15 +0200)
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Fri, 23 Aug 2013 19:15:39 +0000 (21:15 +0200)
inc/poche/Url.class.php
inc/poche/define.inc.php
tpl/home.twig
tpl/view.twig

index 36fdd0f5b445ab27daa6c40b96a9070cd33921ff..3c74fb434bb1b7f14cd0f0934874893c44cb578c 100644 (file)
@@ -65,13 +65,14 @@ class Url
                 $tidy = tidy_parse_string($html, array(), 'UTF8');
                 $tidy->cleanRepair();
 
-                               //Warning: tidy might fail so, ensure there is still a content
-                               $body = $tidy->body();
+                //Warning: tidy might fail so, ensure there is still a content
+                $body = $tidy->body();
 
-                               //hasChildren does not seem to work, just check the string
-                               //returned (and do not forget to clean the white spaces)
-                               if (preg_replace('/\s+/', '', $body->value) !== "<body></body>")
-                                       $html = $tidy->value;
+                //hasChildren does not seem to work, just check the string
+                //returned (and do not forget to clean the white spaces)
+                if (preg_replace('/\s+/', '', $body->value) !== "<body></body>") {
+                    $html = $tidy->value;
+                }
             } 
 
             $parameters = array();
index 80d1f29d386f66d9fd0397b567baa24438a2b228..2154ce8819f95aad7cb62802aa5c7481fdf4f95a 100644 (file)
@@ -22,7 +22,7 @@ define ('REVERT_FORCED_PARAGRAPH_ELEMENTS', FALSE);
 define ('DOWNLOAD_PICTURES', FALSE);
 define ('SHARE_TWITTER', TRUE);
 define ('SHARE_MAIL', TRUE);
-define ('SHARE_SHAARLI', TRUE);
+define ('SHARE_SHAARLI', FALSE);
 define ('SHAARLI_URL', 'http://myshaarliurl.com');
 define ('ABS_PATH', 'assets/');
 define ('TPL', __DIR__ . '/../../tpl');
index 6f6c17e1e5105e59dea4dc94ffe3af136ba67f09..21910ae8c297335ed0eb4bdf6c691cad9a677726 100644 (file)
@@ -13,7 +13,7 @@
             {{ page_links | raw }}
             {% for entry in entries %}
             <div id="entry-{{ entry.id|e }}" class="entrie">
-                <h2><a href="index.php?view=view&id={{ entry.id|e }}">{{ entry.title|e }}</a></h2>
+                <h2><a href="index.php?view=view&id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
                 <ul class="tools">
                     <li><a title="{% trans "toggle mark as read" %}" class="tool archive {% if entry.is_read == 0 %}archive-off{% endif %}" href="./?action=toggle_archive&id={{ entry.id|e }}"><span>{% trans "toggle mark as read" %}</span></a></li>
                     <li><a title="{% trans "toggle favorite" %}" class="tool fav {% if entry.is_fav == 0 %}fav-off{% endif %}" href="./?action=toggle_fav&id={{ entry.id|e }}"><span>{% trans "toggle favorite" %}</span></a></li>
index 78207e15be98c40908ec1dbb9f1b87260d995bf3..82d1fd2a0a32b4e428197bcfae84e6c44704066e 100644 (file)
@@ -13,7 +13,7 @@
                 </ul>
             </div>
             <header class="mbm">
-                <h1>{{ entry.title|e }}</h1>
+                <h1>{{ entry.title|raw }}</h1>
                 <div class="vieworiginal txtright small"><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}">{{ entry.url | e | getDomain }}</a></div>
             </header>
             <article>