diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-10-26 16:35:46 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-10-26 16:35:46 +0200 |
| commit | 3ac2495f49ef0e5ef62030c97ecfd931ce7e4a8b (patch) | |
| tree | 9bba1e7b2d6bf59aca1f5ff34de315e104ab20aa /app | |
| parent | 8deb3066107383ef22d671962465228a80b74508 (diff) | |
| parent | 64b1bb37c290154a87a29f368185cc1398f56d30 (diff) | |
Merge branch 'dev' of github.com:marienfressinaud/FreshRSS into dev
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/Feed.php | 2 | ||||
| -rw-r--r-- | app/views/index/logs.phtml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/Feed.php b/app/models/Feed.php index 02a4e6be7..10695d2a7 100644 --- a/app/models/Feed.php +++ b/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é diff --git a/app/views/index/logs.phtml b/app/views/index/logs.phtml index c72a84c86..09f0c4ecd 100644 --- a/app/views/index/logs.phtml +++ b/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>
\ No newline at end of file +</div> |