diff --git a/cosmogramme/php/_init.php b/cosmogramme/php/_init.php index 9bf1e56bd38dc2c5cd739d2d17f98bfa4f357fae..fe26bb26fb5fa599a31abf73fdc15f3795349908 100644 --- a/cosmogramme/php/_init.php +++ b/cosmogramme/php/_init.php @@ -1,7 +1,7 @@ <?PHP // Constantes -define("VERSION_COSMOGRAMME","6.32"); -define("PATCH_LEVEL","164"); +define("VERSION_COSMOGRAMME","6.33"); +define("PATCH_LEVEL","165"); define("APPLI","cosmogramme"); define("COSMOPATH", "/var/www/html/vhosts/opac2/www/htdocs"); define("CRLF", chr(13) . chr(10)); diff --git a/scripts/emacs/phafi-mode.el b/scripts/emacs/phafi-mode.el index fb13d448853ffb7778f163a23801c4a64a21c3a5..9218e843098e134abcb4d5008ef8804362b5c66a 100644 --- a/scripts/emacs/phafi-mode.el +++ b/scripts/emacs/phafi-mode.el @@ -66,7 +66,7 @@ (gtags-mode t) (setq ag-highlight-search t) - (setq ag-arguments(list "--smart-case" "--nogroup" "--column" "--ignore phonetix.txt" "--ignore TAGS" "--ignore-dir report" "--" )) + (setq ag-arguments(list "--smart-case" "--nogroup" "--column" "--ignore phonetix.txt" "--ignore TAGS" "--ignore-dir report" "--ignore coverage.xml" "--ignore-dir emacs" "--ignore-dir fichiers" "--ignore-dir jQuery" "--" )) ;; (setq ac-sources '(ac-source-etags ac-source-words-in-same-mode-buffers)) (setq ac-sources '(ac-source-gtags ac-source-words-in-buffer)) diff --git a/tests/application/modules/admin/controllers/UsersControllerTest.php b/tests/application/modules/admin/controllers/UsersControllerTest.php index aa52ff6240c9a923acc98f6a796f0588ee114ff4..416e539c1e3f5e23afcecd9b8da545c0aabe9806 100644 --- a/tests/application/modules/admin/controllers/UsersControllerTest.php +++ b/tests/application/modules/admin/controllers/UsersControllerTest.php @@ -66,7 +66,7 @@ abstract class UsersControllerWithMarcusTestCase extends AbstractControllerTestC class UsersControllerIndexTest extends UsersControllerWithMarcusTestCase { public function setUp() { parent::setUp(); - $this->dispatch('/admin/users'); + $this->dispatch('/admin/users', true); }