From: Sven Schöling <s.schoeling@linet-services.de>
Date: Tue, 16 Oct 2012 13:30:33 +0000 (+0200)
Subject: css und js includes in layouts sollten unique sein.
X-Git-Tag: release-3.0.0beta1~124
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=2bed2abd309ca9c6a4e86848a994897449e10819;p=kivitendo-erp.git

css und js includes in layouts sollten unique sein.
---

diff --git a/SL/Layout/Base.pm b/SL/Layout/Base.pm
index 56d5b8e2f..1d31a8228 100644
--- a/SL/Layout/Base.pm
+++ b/SL/Layout/Base.pm
@@ -3,6 +3,8 @@ package SL::Layout::Base;
 use strict;
 use parent qw(SL::Controller::Base);
 
+use List::MoreUtils qw(uniq);
+
 use Rose::Object::MakeMethods::Generic (
   'scalar --get_set_init' => qw(menu),
   'scalar'                => qw(focus),
@@ -49,12 +51,12 @@ sub post_content {
 }
 
 sub stylesheets_inline {
-  ( map { $_->stylesheets_inline } $_[0]->sub_layouts ),
+  uniq ( map { $_->stylesheets_inline } $_[0]->sub_layouts ),
   @{ $_[0]->{stylesheets_inline} || [] };
 }
 
 sub javascripts_inline {
-  ( map { $_->javascripts_inline } $_[0]->sub_layouts ),
+  uniq ( map { $_->javascripts_inline } $_[0]->sub_layouts ),
   @{ $_[0]->{javascripts_inline} || [] };
 }
 
@@ -73,7 +75,7 @@ sub stylesheets {
   my ($self) = @_;
   my $css_path = $self->get_stylesheet_for_user;
 
-  return grep { $_ } map { $self->_find_stylesheet($_, $css_path)  }
+  return uniq grep { $_ } map { $self->_find_stylesheet($_, $css_path)  }
     $self->use_stylesheet, map { $_->stylesheets } $self->sub_layouts;
 }
 
@@ -113,7 +115,7 @@ sub use_javascript {
 sub javascripts {
   my ($self) = @_;
 
-  return map { $self->_find_javascript($_)  }
+  return uniq map { $self->_find_javascript($_)  }
     $self->use_javascript, map { $_->javascripts } $self->sub_layouts;
 }