Merge branch 'hotline#83545_controle_des_url_url_non_traitees' into 'hotline'

hotline #83545 url manager: preg escape urls

See merge request !2953

VERSIONS_HOTLINE/83545

+ - ticket #83545 : Contrôle des URLS : corrections de la prise en charge des URLs contenant des caractères spéciaux
\ No newline at end of file

library/Class/UrlManager.php

@@ -45,7 +45,7 @@ class Class_UrlManager extends Class_Entity {
                                 '://'],
                                '',
                                $term);
-      $preg =  '@(' . $protocol . '://'. $search_pattern . '*' . $preg_term . $search_pattern . '*)[\b\s]?@i';
+      $preg =  '@(' . $protocol . '://'. $search_pattern . '*' . preg_quote($preg_term) . $search_pattern . '*)[\b\s]?@i';
     }
 
     $this

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

@@ -292,3 +292,27 @@ class UrlManagerControllerAsyncUpdateUrlInModelsActionTest extends UrlManagerTes
     $this->assertContains('https', Class_Article::find(78)->getContenu());
   }
 }
+
+
+
+
+class UrlManagerControllerIndexDispatchUrlWithPlusTest extends UrlManagerTestCase {
+  public function setUp() {
+    parent::setUp();
+
+    $this->fixture('Class_Article',
+                   ['id' => 78,
+                    'titre' => 'Chien et chat',
+                    'description' => 'test de description : http://mon-domain.org',
+                    'contenu' => 'test: http://monurl.fr. http://mon-domain.org/recherche/pommo+d\'api']);
+
+    $this->dispatch(sprintf('/admin/url-manager/index/term/%s',
+                            urlencode('http://mon-domain.org/recherche/pommo+d\'api')));
+  }
+
+
+  /** @test **/
+  public function tableUrlShouldContainsMonDomainePregEscaped() {
+    $this->assertXPathContentContains('//table[@id="urls"]//td', 'http://mon-domain.org/recherche/pommo+d\'api');
+  }
+}
\ No newline at end of file