diff --git a/module/blog/blog.php b/module/blog/blog.php index 9ef5409a..53192163 100644 --- a/module/blog/blog.php +++ b/module/blog/blog.php @@ -31,10 +31,6 @@ class blog extends common { public static $pages; - public static $rssUrl; - - public static $rssLabel; - public static $states = [ false => 'Brouillon', true => 'Publié' @@ -476,8 +472,6 @@ class blog extends common { for($i = $pagination['first']; $i < $pagination['last']; $i++) { self::$comments[$commentIds[$i]] = $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'comment', $commentIds[$i]]); } - self::$rssUrl = helper::baseUrl() . $this->getUrl(0) . '/rss'; - self::$rssLabel = $this->getData(['module', $this->getUrl(0), 'config','feedsLabel']); // Valeurs en sortie $this->addOutput([ 'showBarEditButton' => true, @@ -506,8 +500,6 @@ class blog extends common { for($i = $pagination['first']; $i < $pagination['last']; $i++) { self::$articles[$articleIds[$i]] = $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i]]); } - self::$rssUrl = helper::baseUrl() . $this->getUrl(0) . '/rss'; - self::$rssLabel = $this->getData(['module', $this->getUrl(0), 'config','feedsLabel']); // Valeurs en sortie $this->addOutput([ 'showBarEditButton' => true, diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php index 22fe5da1..1841f23d 100644 --- a/module/blog/view/article/article.php +++ b/module/blog/view/article/article.php @@ -39,14 +39,16 @@

-
- - - ' . $module::$rssLabel . '

' ; - ?> -
-
+ getData(['module',$this->getUrl(0), 'config', 'feeds'])): ?> +
+ + + ' . $this->getData(['module',$this->getUrl(0), 'config', 'feedsLabel']) . '

' ; + ?> +
+
+ getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'closeComment'])): ?>

Cet article ne reçoit pas de commentaire.

diff --git a/module/blog/view/index/index.php b/module/blog/view/index/index.php index 134101f0..17e802ca 100644 --- a/module/blog/view/index/index.php +++ b/module/blog/view/index/index.php @@ -48,14 +48,16 @@ -
- - - ' . $module::$rssLabel . '

' ; - ?> -
-
+ getData(['module',$this->getUrl(0), 'config', 'feeds'])): ?> +
+ + + ' . $this->getData(['module',$this->getUrl(0), 'config', 'feedsLabel']) . '

' ; + ?> +
+
+ \ No newline at end of file diff --git a/module/news/news.php b/module/news/news.php index 30e1a5c8..a588ee15 100644 --- a/module/news/news.php +++ b/module/news/news.php @@ -29,10 +29,6 @@ class news extends common { public static $pages; - public static $rssUrl; - - public static $rssLabel; - public static $states = [ false => 'Brouillon', true => 'Publié' @@ -299,8 +295,6 @@ class news extends common { for($i = $pagination['first']; $i < $pagination['last']; $i++) { self::$news[$newsIds[$i]] = $this->getData(['module', $this->getUrl(0),'posts', $newsIds[$i]]); } - self::$rssUrl = helper::baseUrl() . $this->getUrl(0) . '/rss'; - self::$rssLabel = $this->getData(['module', $this->getUrl(0), 'config','feedsLabel']); // Valeurs en sortie $this->addOutput([ 'showBarEditButton' => true, diff --git a/module/news/view/index/index.php b/module/news/view/index/index.php index 061e595c..2b2636f1 100644 --- a/module/news/view/index/index.php +++ b/module/news/view/index/index.php @@ -21,14 +21,16 @@ -
- - - ' . $module::$rssLabel . '

' ; - ?> -
-
+ getData(['module',$this->getUrl(0), 'config', 'feeds'])): ?> +
+ + + ' . $this->getData(['module',$this->getUrl(0), 'config', 'feedsLabel']) . '

' ; + ?> +
+
+