From 6a3954b0e2486d2f64757a81f965d1d23a08e460 Mon Sep 17 00:00:00 2001
From: Ghislain Loas <ghislo@sandbox.pergame.net>
Date: Tue, 7 Jul 2015 11:06:55 +0200
Subject: [PATCH] remove adminFormat text and use standart format
---
library/ZendAfi/View/Helper/Avis.php | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/library/ZendAfi/View/Helper/Avis.php b/library/ZendAfi/View/Helper/Avis.php
index 60a8e2f28e6..315ba30fbea 100644
--- a/library/ZendAfi/View/Helper/Avis.php
+++ b/library/ZendAfi/View/Helper/Avis.php
@@ -284,30 +284,19 @@ class ZendAfi_View_Helper_Avis extends ZendAfi_View_Helper_BaseHelper {
protected function _formatTextAvis($avis) {
- return $avis->getAbonOuBib() ?
- $this->_formatAdminText($avis) :
- $this->_formatWithTruncate($this->view->escape($avis->getAvis()));
- }
-
-
- protected function _formatAdminText($avis) {
- $value = $avis->getAvis();
- if ($this->_is_html($value) && $this->_limit_nb_word) {
- $value = str_replace(['<br>', '<br/>', '<br />'], "\n", $value);
- return $this->_formatWithTruncate(strip_tags($value));
- }
-
- return ['text_avis' => nl2br($value), 'lire_la_suite' => false];
+ return $this->_formatWithTruncate($this->view->escape(strip_tags($avis->getAvis())));
}
protected function _formatWithTruncate($txt_avis) {
if (($this->_limit_nb_word <= 0)
|| count($words = explode(' ', $txt_avis)) <= $this->_limit_nb_word)
- return ['text_avis' => nl2br($txt_avis), 'lire_la_suite' => false];
+ return ['text_avis' => nl2br($txt_avis),
+ 'lire_la_suite' => false];
$txt_avis = implode(' ', array_slice($words, 0, $this->_limit_nb_word));
- return ['text_avis' => nl2br($txt_avis) . ' [...]', 'lire_la_suite' => true];
+ return ['text_avis' => nl2br($txt_avis) . ' [...]',
+ 'lire_la_suite' => true];
}
--
GitLab