Merge branch 'dev'

Conflicts:
	CHANGELOG
	README.fr.md
	README.md
	app/Controllers/feedController.php
	app/Controllers/indexController.php
	app/i18n/en.php
	app/i18n/fr.php
	app/views/helpers/view/normal_view.phtml
	app/views/stats/index.phtml
	app/views/stats/repartition.phtml
	constants.php
	p/scripts/main.js

1 files changed, 22 insertions, 18 deletions

diff --git a/app/views/helpers/pagination.phtml b/app/views/helpers/pagination.phtml
index cea338364..b20201c4b 100755
--- a/app/views/helpers/pagination.phtml
+++ b/app/views/helpers/pagination.phtml
@@ -1,36 +1,40 @@
 <?php
-	$c = Minz_Request::controllerName();
-	$a = Minz_Request::actionName();
-	$params = Minz_Request::params();
-	$markReadUrl = Minz_Session::param('markReadUrl');
-	Minz_Session::_param('markReadUrl', false);
+	$url_next = Minz_Request::currentRequest();
+	$url_next['params']['next'] = FreshRSS_Context::$next_id;
+	$url_next['params']['ajax'] = 1;
+
+	$url_mark_read = array(
+		'c' => 'entry',
+		'a' => 'read',
+		'params' => array(
+			'get' => FreshRSS_Context::currentGet(),
+			'nextGet' => FreshRSS_Context::$next_get,
+			'idMax' => FreshRSS_Context::$id_max,
+		)
+	);
 ?>
 
 <form id="mark-read-pagination" method="post" style="display: none"></form>
 
 <ul class="pagination">
 	<li class="item pager-next">
-	<?php if (!empty($this->nextId)) { ?>
-		<?php
-			$params['next'] = $this->nextId;
-			$params['ajax'] = 1;
-		?>
-		<a id="load_more" href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>">
-			<?php echo _t('load_more'); ?>
+	<?php if (FreshRSS_Context::$next_id) { ?>
+		<a id="load_more" href="<?php echo Minz_Url::display($url_next); ?>">
+			<?php echo _t('gen.pagination.load_more'); ?>
 		</a>
-	<?php } elseif ($markReadUrl) { ?>
+	<?php } elseif ($url_mark_read) { ?>
 		<button id="bigMarkAsRead"
-		        class="as-link <?php echo $this->conf->reading_confirm ? 'confirm' : ''; ?>"
+		        class="as-link <?php echo FreshRSS_Context::$user_conf->reading_confirm ? 'confirm' : ''; ?>"
 		        form="mark-read-pagination"
-		        formaction="<?php echo $markReadUrl; ?>"
+		        formaction="<?php echo Minz_Url::display($url_mark_read); ?>"
 		        type="submit">
-			<?php echo _t('nothing_to_load'); ?><br />
+			<?php echo _t('gen.pagination.nothing_to_load'); ?><br />
 			<span class="bigTick">✓</span><br />
-			<?php echo _t('mark_all_read'); ?>
+			<?php echo _t('gen.pagination.mark_all_read'); ?>
 		</button>
 	<?php } else { ?>
 		<a id="bigMarkAsRead" href=".">
-			<?php echo _t('nothing_to_load'); ?><br />
+			<?php echo _t('gen.pagination.nothing_to_load'); ?><br />
 		</a>
 	<?php } ?>
 	</li>