mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-06 22:23:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 252-extensions

Browse Source 
Conflicts:
	app/FreshRSS.php
	app/Models/Configuration.php
	app/views/index/index.phtml
	app/views/index/normal.phtml
	lib/Minz/Configuration.php
	lib/Minz/Translate.php
	lib/lib_rss.php
This commit is contained in:
Marien Fressinaud
2015-01-08 14:18:32 +01:00
parent 26da4aa448 0e4e16ac55
commit 73023bc12b
84 changed files with 2006 additions and 1396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controllers/importExportController.php
View File

@@ -174,7 +174,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
$nb_feeds = count($this->feedDAO->listFeeds());
$nb_cats = count($this->catDAO->listCategories(false));
$limits = Minz_Configuration::limits();
$limits = FreshRSS_Context::$system_conf->limits;
foreach ($opml_elements as $elt) {
$is_error = false;
@@ -321,7 +321,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
return true;
}
$is_read = FreshRSS_Context::$conf->mark_when['reception'] ? 1 : 0;
$is_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0;
$google_compliant = strpos($article_object['id'], 'com.google') !== false;
@@ -329,7 +329,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
$article_to_feed = array();
$nb_feeds = count($this->feedDAO->listFeeds());
$limits = Minz_Configuration::limits();
$limits = FreshRSS_Context::$system_conf->limits;
// First, we check feeds of articles are in DB (and add them if needed).
foreach ($article_object['items'] as $item) {
@@ -548,7 +548,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
$this->view->type = 'feed/' . $feed->id();
$this->view->entries = $this->entryDAO->listWhere(
'f', $feed->id(), FreshRSS_Entry::STATE_ALL, 'ASC',
FreshRSS_Context::$conf->posts_per_page
FreshRSS_Context::$user_conf->posts_per_page
);
$this->view->feed = $feed;
}