pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'dev' of https://github.com/wallabag/wallabag into dev

Browse Source
This commit is contained in:
Nicolas Lœuillet
2014-02-12 20:05:51 +01:00
parent 5966d2c2d3 58f6269f36
commit 68268c0199
36 changed files with 1362 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
inc/.htaccess Normal file
View File

@ -0,0 +1,2 @@
Order deny,allow
Deny from all

5
inc/poche/Poche.class.php
View File

@ -371,7 +371,7 @@ class Poche
{
case 'add':
$content = $this->getPageContent($url);
$title = $content['rss']['channel']['item']['title'];
$title = ($content['rss']['channel']['item']['title'] != '') ? $content['rss']['channel']['item']['title'] : _('Untitled');
$body = $content['rss']['channel']['item']['description'];
if ($this->store->add($url->getUrl(), $title, $body, $this->user->getId())) {
@ -561,7 +561,8 @@ class Poche
if (count($entries) > 0) {
$this->pagination->set_total(count($entries));
$page_links = $this->pagination->page_links('?view=' . $view . '&sort=' . $_SESSION['sort'] . '&');
$page_links = str_replace(array('previous', 'next'), array(_('previous'), _('next')),
$this->pagination->page_links('?view=' . $view . '&sort=' . $_SESSION['sort'] . '&'));
$datas = $this->store->getEntriesByView($view, $this->user->getId(), $this->pagination->get_limit());
$tpl_vars['entries'] = $datas;
$tpl_vars['page_links'] = $page_links;