Merge branch 'dev' of github.com:marienfressinaud/FreshRSS into dev

app/models/Feed.php

@@ -205,7 +205,7 @@ class Feed extends Model {
 				$feed->init ();
 
 				if ($feed->error ()) {
-					throw new FeedException ($feed->error);
+					throw new FeedException ($feed->error . ' [' . $url . ']');
 				}
 
 				// si on a utilisé l'auto-discover, notre url va avoir changé

app/views/index/logs.phtml

@@ -10,7 +10,7 @@
 		<?php $this->logsPaginator->render ('logs_pagination.phtml', 'page'); ?>
 		
 		<?php foreach ($items as $log) { ?>
-		<div class="log <?php echo $log->level (); ?>"><span class="date"><?php echo date ('d/m/Y - H:i:s', strtotime ($log->date ())); ?></span><?php echo $log->info (); ?></div>
+		<div class="log <?php echo $log->level (); ?>"><span class="date"><?php echo date ('d/m/Y - H:i:s', strtotime ($log->date ())); ?></span><?php echo htmlspecialchars ($log->info (), ENT_NOQUOTES, 'UTF-8'); ?></div>
 		<?php } ?>
 		
 		<?php $this->logsPaginator->render ('logs_pagination.phtml','page'); ?>
@@ -18,4 +18,4 @@
 	<?php } else { ?>
 	<p class="alert alert-warn"><?php echo Translate::t ('logs_empty'); ?></p>
 	<?php } ?>
-</div>
+</div>