diff options
Diffstat (limited to 'inc')
-rw-r--r-- | inc/3rdparty/site_config/custom/interviewmagazine.com.txt | 4 | ||||
-rw-r--r-- | inc/3rdparty/site_config/custom/inthepoche.com.txt | 7 | ||||
-rw-r--r-- | inc/poche/Database.class.php | 4 | ||||
-rw-r--r-- | inc/poche/Poche.class.php | 2 |
4 files changed, 7 insertions, 10 deletions
diff --git a/inc/3rdparty/site_config/custom/interviewmagazine.com.txt b/inc/3rdparty/site_config/custom/interviewmagazine.com.txt new file mode 100644 index 00000000..a9d4f8ca --- /dev/null +++ b/inc/3rdparty/site_config/custom/interviewmagazine.com.txt | |||
@@ -0,0 +1,4 @@ | |||
1 | title: //title | ||
2 | body: //div[contains(@class, 'block')] | ||
3 | |||
4 | test_url: http://www.interviewmagazine.com/film/spike-jonze \ No newline at end of file | ||
diff --git a/inc/3rdparty/site_config/custom/inthepoche.com.txt b/inc/3rdparty/site_config/custom/inthepoche.com.txt deleted file mode 100644 index ede74b97..00000000 --- a/inc/3rdparty/site_config/custom/inthepoche.com.txt +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | title: //title | ||
2 | body: //div[@class='post-content'] | ||
3 | |||
4 | prune: no | ||
5 | tidy: no | ||
6 | |||
7 | test_url: http://www.inthepoche.com/?post/poche-hosting \ No newline at end of file | ||
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index afe02a41..d8b63859 100644 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php | |||
@@ -337,7 +337,7 @@ class Database { | |||
337 | 337 | ||
338 | public function retrieveEntriesByTag($tag_id) { | 338 | public function retrieveEntriesByTag($tag_id) { |
339 | $sql = | 339 | $sql = |
340 | "SELECT * FROM entries | 340 | "SELECT entries.* FROM entries |
341 | LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id | 341 | LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id |
342 | WHERE tags_entries.tag_id = ?"; | 342 | WHERE tags_entries.tag_id = ?"; |
343 | $query = $this->executeQuery($sql, array($tag_id)); | 343 | $query = $this->executeQuery($sql, array($tag_id)); |
@@ -348,7 +348,7 @@ class Database { | |||
348 | 348 | ||
349 | public function retrieveTagsByEntry($entry_id) { | 349 | public function retrieveTagsByEntry($entry_id) { |
350 | $sql = | 350 | $sql = |
351 | "SELECT * FROM tags | 351 | "SELECT tags.* FROM tags |
352 | LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id | 352 | LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id |
353 | WHERE tags_entries.entry_id = ?"; | 353 | WHERE tags_entries.entry_id = ?"; |
354 | $query = $this->executeQuery($sql, array($entry_id)); | 354 | $query = $this->executeQuery($sql, array($entry_id)); |
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 4f70afb7..d3eb71d2 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php | |||
@@ -951,7 +951,7 @@ class Poche | |||
951 | if (count($entries) > 0) { | 951 | if (count($entries) > 0) { |
952 | foreach ($entries as $entry) { | 952 | foreach ($entries as $entry) { |
953 | $newItem = $feed->createNewItem(); | 953 | $newItem = $feed->createNewItem(); |
954 | $newItem->setTitle(htmlentities($entry['title'])); | 954 | $newItem->setTitle($entry['title']); |
955 | $newItem->setLink(Tools::getPocheUrl() . '?view=view&id=' . $entry['id']); | 955 | $newItem->setLink(Tools::getPocheUrl() . '?view=view&id=' . $entry['id']); |
956 | $newItem->setDate(time()); | 956 | $newItem->setDate(time()); |
957 | $newItem->setDescription($entry['content']); | 957 | $newItem->setDescription($entry['content']); |