hotline #68975 test fix

application/modules/admin/controllers/CmsController.php

@@ -68,7 +68,11 @@ class Admin_CmsController extends ZendAfi_Controller_Action {
                                ? $this->_bib->getId()
                                : null);
 
-    $id_cat = ($article = Class_Article::find($this->_getParam('id')))
+    $article = ($id_article = $this->_getParam('id', null))
+      ? Class_Article::find($id_article)
+      : null;
+
+    $id_cat = $article
       ? $article->getIdCat()
       : $this->_getParam('id_cat', 0);
 

tests/application/modules/admin/controllers/CmsControllerListModeTest.php

@@ -366,6 +366,7 @@ class CmsControllerListModeAdminBibSearchTest extends CmsControllerListModeTestC
               'order' => 'titre',
               'limitPage' => [0, 25]])
       ->answers([Class_Article::find(1)])
+
       ->whenCalled('countBy')
       ->with(['where' => '(titre like \'%news%\')',
               'id_cat' => [1,23,34],
@@ -377,19 +378,19 @@ class CmsControllerListModeAdminBibSearchTest extends CmsControllerListModeTestC
     $this->dispatch('/admin/cms/index/title_search/news', true);
   }
 
+
   /** @test */
   public function upButtonInTitleShouldBeUrlWithOrderTitle() {
     $this->assertXPath('//th//a[contains(@href,"/admin/cms/index/title_search/news/order/titre")]',$this->_response->getBody());
   }
 
 
-    /** @test */
+  /** @test */
   public function downButtonInTitleShouldBeUrlWithOrderTitleDesc() {
     $this->assertXPath('//th//a[contains(@href,"/admin/cms/index/title_search/news/order/titre+desc")]',$this->_response->getBody());
   }
 
 
-
   /** @test */
   public function newsFromPortailShouldNotBePresent() {
     $this->assertNotXPathContentContains('//td', 'News from portail');
@@ -512,6 +513,7 @@ class CmsControllerListModeSearchPostFormTest extends CmsControllerListModeTestC
 
 
 
+
 class CmsControllerListModeBackToIndexFromArticlesConcertTest extends CmsControllerListModeTestCase {
   public function setUp() {
     parent::setUp();