diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2014-03-22 13:22:55 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2014-03-22 13:22:55 +0100 |
| commit | 69deb27f654a0d5d5e6fe77733d56a9c4fd29e03 (patch) | |
| tree | d6fbc0511d76263881cafaa187ce7cca523b9811 /app | |
| parent | d1c5db7461ecb69c529149536718baf9b73a1f2c (diff) | |
| parent | 72ae58d45534b4c8b49ea0ac33a9a9ec9df4bdb1 (diff) | |
Merge remote-tracking branch 'origin/dev' into 163-export
Diffstat (limited to 'app')
| -rw-r--r-- | app/Models/Feed.php | 4 | ||||
| -rw-r--r-- | app/views/configure/categorize.phtml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/Models/Feed.php b/app/Models/Feed.php index bce3bd24f..13d3dfe88 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -210,8 +210,8 @@ class FreshRSS_Feed extends Minz_Model { } if ($loadDetails) { - $title = htmlspecialchars(html_only_entity_decode($feed->get_title()), ENT_COMPAT, 'UTF-8'); - $this->_name ($title === null ? $this->url : $title); + $title = strtr(html_only_entity_decode($feed->get_title()), array('<' => '<', '>' => '>', '"' => '"')); //HTML to HTML-PRE //ENT_COMPAT except & + $this->_name ($title == '' ? $this->url : $title); $this->_website(html_only_entity_decode($feed->get_link())); $this->_description(html_only_entity_decode($feed->get_description())); diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml index a564e8cdd..c0171d2dc 100644 --- a/app/views/configure/categorize.phtml +++ b/app/views/configure/categorize.phtml @@ -17,11 +17,11 @@ <input type="text" id="cat_<?php echo $cat->id (); ?>" name="categories[]" value="<?php echo $cat->name (); ?>" /> <?php if ($cat->nbFeed () > 0) { ?> - <a class="confirm" href="<?php echo _url ('feed', 'delete', 'id', $cat->id (), 'type', 'category'); ?>"><?php echo Minz_Translate::t ('ask_empty'); ?></a> + <button type="submit" class="btn btn-attention confirm" formaction="<?php echo _url ('feed', 'delete', 'id', $cat->id (), 'type', 'category'); ?>"><?php echo Minz_Translate::t ('ask_empty'); ?></button> <?php } ?> (<?php echo Minz_Translate::t ('number_feeds', $cat->nbFeed ()); ?>) - <?php if ($cat->id () == $this->defaultCategory->id ()) { ?> + <?php if ($cat->id () === $this->defaultCategory->id ()) { ?> <?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t ('can_not_be_deleted'); ?> <?php } ?> |