Skip to content
Snippets Groups Projects
Commit 65fd357f authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

Merge branch 'master' into 'hotline-master'

Master

See merge request !1291
parents 5b2d9a0e e1b01a84
Branches
Tags
6 merge requests!1553Master,!1502Master,!1501Stable,!1312Master,!1299Master,!1298Hotline master
23/11/2015 - v7.3.30
- ticket #5524 : Correction compatibilité php < 5.5
23/11/2015 - v7.3.29
- ticket #32511 : Ajout d'une case à cocher "Brouillon ?" dans le formulaire d'édition d'une newsletter qui permet de la masquer à l'opac.
......
......@@ -118,7 +118,8 @@ class Class_Onglet {
public function hasRecounts($record) {
return !empty(Class_Onglet_Analytics::getRecounts($record));
$recounts = Class_Onglet_Analytics::getRecounts($record);
return !empty($recounts);
}
......
......@@ -65,7 +65,7 @@ function defineConstant($name, $value) {
function setupConstants() {
defineConstant('BOKEH_MAJOR_VERSION','7.3');
defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.29');
defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.30');
defineConstant('BOKEH_REMOTE_FILES', 'http://git.afi-sa.fr/afi/opacce/');
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment