From 4c5e9d0dd828ec9da44b0f178edd73b7213d6d20 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Tue, 12 Nov 2013 22:37:25 +0100 Subject: Cohérence htmlspecialchars MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Le texte dans la base de données est en htmlspecialchars(UTF-8) (c'est-à-dire avec `<>&'"` encodés) mais maintenant sans autre entité HTML depuis https://github.com/marienfressinaud/FreshRSS/commit/a4fc7becb8553198d132633d775989c89c8116cd Ce patch supprime les htmlspecialchars qui faisaient du double-encodage, et en modifie d'autres en entrée. --- app/layout/aside_feed.phtml | 2 +- app/layout/aside_flux.phtml | 4 ++-- app/layout/layout.phtml | 2 +- app/models/Entry.php | 2 +- app/views/helpers/view/global_view.phtml | 4 ++-- app/views/helpers/view/normal_view.phtml | 3 +-- app/views/helpers/view/reader_view.phtml | 2 +- app/views/helpers/view/rss_view.phtml | 2 +- 8 files changed, 10 insertions(+), 11 deletions(-) (limited to 'app') diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml index 3cfce61c5..49767740b 100644 --- a/app/layout/aside_feed.phtml +++ b/app/layout/aside_feed.phtml @@ -54,7 +54,7 @@
  • ✇ - name (), ENT_NOQUOTES, 'UTF-8'); ?> + name (); ?>
    • diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml index 87e2c000d..9471f1f7e 100644 --- a/app/layout/aside_flux.phtml +++ b/app/layout/aside_flux.phtml @@ -35,7 +35,7 @@
  • get_c == $cat->id ()) { $c_active = true; } ?>
    - name (), ENT_NOQUOTES, 'UTF-8'); ?> + name (); ?>
    @@ -51,7 +51,7 @@ ✇ - name(), ENT_NOQUOTES, 'UTF-8'); ?> + name(); ?>
    • diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index 9d4147887..adcc74871 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -19,7 +19,7 @@ rss_url)) { ?> - + diff --git a/app/models/Entry.php b/app/models/Entry.php index 5c6b379d8..e40cb5992 100755 --- a/app/models/Entry.php +++ b/app/models/Entry.php @@ -409,7 +409,7 @@ class EntryDAO extends Model_pdo { } $sql = 'SELECT e.* FROM ' . $this->prefix . 'entry e' - . ' INNER JOIN ' . $this->prefix . 'feed f ON e.id_feed = f.id' . $where + . ' INNER JOIN ' . $this->prefix . 'feed f ON e.id_feed = f.id' . $where . ' ORDER BY e.date' . $order . ', e.id' . $order; if (empty($limitCount)) { diff --git a/app/views/helpers/view/global_view.phtml b/app/views/helpers/view/global_view.phtml index fc55ed8ba..0eb29b11a 100644 --- a/app/views/helpers/view/global_view.phtml +++ b/app/views/helpers/view/global_view.phtml @@ -10,7 +10,7 @@
    - name(), ENT_NOQUOTES, 'UTF-8'); ?> 0 ? ' (' . $catNotRead . ')' : ''; ?> + name(); ?> 0 ? ' (' . $catNotRead . ')' : ''; ?>
    @@ -22,7 +22,7 @@ 0 ? '' : ''; ?> - name(), ENT_NOQUOTES, 'UTF-8'); ?> + name(); ?> 0 ? ' (' . $not_read . ')' : ''; ?> 0 ? '' : ''; ?> diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml index 173fbad9a..faa52179a 100644 --- a/app/views/helpers/view/normal_view.phtml +++ b/app/views/helpers/view/normal_view.phtml @@ -46,7 +46,7 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) { $feed = HelperCategory::findFeed($this->cat_aside, $item->feed ()); //We most likely already have the feed object in cache if (empty($feed)) $feed = $item->feed (true); ?> -
  • ✇ name(), ENT_NOQUOTES, 'UTF-8'); ?>
    • +
  • ✇ name(); ?>
  • title (); ?>
    • conf->toplineDate ()) { ?>
  • date (); ?> 
    • conf->toplineLink ()) { ?>
  •  
    • @@ -65,7 +65,6 @@ if (isset ($this->entryPaginator) && !$this->entryPaginator->isEmpty ()) { } ?>
    -