Merge remote-tracking branch 'refs/remotes/origin/master' into...

Merge remote-tracking branch 'refs/remotes/origin/master' into hotline#74605_probleme_d_affichage_d_image_pour_article

library/Class/Feature.php

@@ -140,7 +140,6 @@ class Class_Feature {
 
     $session->features_seen = true;
 
-
     Class_ScriptLoader::getInstance()
       ->notify($this->_renderContent($features), false, 10, 'new_features');
   }

tests/application/modules/opac/controllers/NoticeAjaxControllerItemsTest.php

@@ -253,6 +253,8 @@ class NoticeAjaxControllerItemsCustomIconsTest
     $profil->setCfgNotice($config);
 
     $profil->setDefaultSkin($this->mock()
+                            ->whenCalled('getCssUrl')
+                            ->answers(true)
                             ->whenCalled('getPath')->answers('/skins/customized')
                             ->whenCalled('getTemplatesPath')->answers('/skins/customized/html')
                             ->whenCalled('getImageUrl')