aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--inc/poche/Url.class.php13
-rw-r--r--inc/poche/define.inc.php2
-rw-r--r--tpl/home.twig2
-rw-r--r--tpl/view.twig2
4 files changed, 10 insertions, 9 deletions
diff --git a/inc/poche/Url.class.php b/inc/poche/Url.class.php
index 36fdd0f5..3c74fb43 100644
--- a/inc/poche/Url.class.php
+++ b/inc/poche/Url.class.php
@@ -65,13 +65,14 @@ class Url
65 $tidy = tidy_parse_string($html, array(), 'UTF8'); 65 $tidy = tidy_parse_string($html, array(), 'UTF8');
66 $tidy->cleanRepair(); 66 $tidy->cleanRepair();
67 67
68 //Warning: tidy might fail so, ensure there is still a content 68 //Warning: tidy might fail so, ensure there is still a content
69 $body = $tidy->body(); 69 $body = $tidy->body();
70 70
71 //hasChildren does not seem to work, just check the string 71 //hasChildren does not seem to work, just check the string
72 //returned (and do not forget to clean the white spaces) 72 //returned (and do not forget to clean the white spaces)
73 if (preg_replace('/\s+/', '', $body->value) !== "<body></body>") 73 if (preg_replace('/\s+/', '', $body->value) !== "<body></body>") {
74 $html = $tidy->value; 74 $html = $tidy->value;
75 }
75 } 76 }
76 77
77 $parameters = array(); 78 $parameters = array();
diff --git a/inc/poche/define.inc.php b/inc/poche/define.inc.php
index 80d1f29d..2154ce88 100644
--- a/inc/poche/define.inc.php
+++ b/inc/poche/define.inc.php
@@ -22,7 +22,7 @@ define ('REVERT_FORCED_PARAGRAPH_ELEMENTS', FALSE);
22define ('DOWNLOAD_PICTURES', FALSE); 22define ('DOWNLOAD_PICTURES', FALSE);
23define ('SHARE_TWITTER', TRUE); 23define ('SHARE_TWITTER', TRUE);
24define ('SHARE_MAIL', TRUE); 24define ('SHARE_MAIL', TRUE);
25define ('SHARE_SHAARLI', TRUE); 25define ('SHARE_SHAARLI', FALSE);
26define ('SHAARLI_URL', 'http://myshaarliurl.com'); 26define ('SHAARLI_URL', 'http://myshaarliurl.com');
27define ('ABS_PATH', 'assets/'); 27define ('ABS_PATH', 'assets/');
28define ('TPL', __DIR__ . '/../../tpl'); 28define ('TPL', __DIR__ . '/../../tpl');
diff --git a/tpl/home.twig b/tpl/home.twig
index 6f6c17e1..21910ae8 100644
--- a/tpl/home.twig
+++ b/tpl/home.twig
@@ -13,7 +13,7 @@
13 {{ page_links | raw }} 13 {{ page_links | raw }}
14 {% for entry in entries %} 14 {% for entry in entries %}
15 <div id="entry-{{ entry.id|e }}" class="entrie"> 15 <div id="entry-{{ entry.id|e }}" class="entrie">
16 <h2><a href="index.php?view=view&id={{ entry.id|e }}">{{ entry.title|e }}</a></h2> 16 <h2><a href="index.php?view=view&id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
17 <ul class="tools"> 17 <ul class="tools">
18 <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> 18 <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>
19 <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> 19 <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>
diff --git a/tpl/view.twig b/tpl/view.twig
index 78207e15..82d1fd2a 100644
--- a/tpl/view.twig
+++ b/tpl/view.twig
@@ -13,7 +13,7 @@
13 </ul> 13 </ul>
14 </div> 14 </div>
15 <header class="mbm"> 15 <header class="mbm">
16 <h1>{{ entry.title|e }}</h1> 16 <h1>{{ entry.title|raw }}</h1>
17 <div class="vieworiginal txtright small"><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}">{{ entry.url | e | getDomain }}</a></div> 17 <div class="vieworiginal txtright small"><a href="{{ entry.url|e }}" target="_blank" title="{% trans "original" %} : {{ entry.title|e }}">{{ entry.url | e | getDomain }}</a></div>
18 </header> 18 </header>
19 <article> 19 <article>