summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2012-11-07 19:04:00 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2012-11-07 19:04:00 +0100
commit85cc23fb4fde71809a6e510dabb66a7e4d612233 (patch)
tree932dbab32fb84f727dc272d02f1e00c69fcaa5bb
parent567d19a98934747d0817ad58a008dce7d5df0d92 (diff)
Fix bug get_content_by_parsing()
-rw-r--r--lib/lib_rss.php13
-rw-r--r--public/scripts/endless_mode.js2
2 files changed, 7 insertions, 8 deletions
diff --git a/lib/lib_rss.php b/lib/lib_rss.php
index 8f4b6cc3a..f0a65fa49 100644
--- a/lib/lib_rss.php
+++ b/lib/lib_rss.php
@@ -190,17 +190,16 @@ function good_bye_extra ($element) {
}
/* permet de récupérer le contenu d'un article pour un flux qui n'est pas complet */
function get_content_by_parsing ($url, $path) {
- $content = new simple_html_dom ();
- $content->set_callback ('good_bye_extra');
- $ok = $content->load_file ($url);
+ $html = new simple_html_dom ();
+ $html->set_callback ('good_bye_extra');
+ $ok = $html->load_file ($url);
if ($ok !== false) {
- // Le __toString () permet d'écraser le DOM (on n'en a plus besoin)
- // une autre solution serait $content->clear () qui vide le dom
- $content = $content->find ($path, 0)->__toString ();
+ $content = $html->find ($path, 0);
+ $html->clear ();
if ($content) {
- return $content;
+ return $content->__toString ();
} else {
throw new Exception ();
}
diff --git a/public/scripts/endless_mode.js b/public/scripts/endless_mode.js
index ca3c12572..a05da97db 100644
--- a/public/scripts/endless_mode.js
+++ b/public/scripts/endless_mode.js
@@ -16,7 +16,7 @@ function load_more_posts () {
$(document).ready (function () {
url = $(".pagination:last li.pager-next a").attr ("href");
- $(".pagination").remove ();
+ $(".pagination:last").remove ();
$("#stream").append ("<a id=\"load_more\" href=\"#\">Charger plus d'articles</a>");