Alex Arnaud authored 10 years ago and Julian Maurice committed 10 years ago

variable.
  - Don't explicitly call getLoader method of Class_Users using
    isCurrentUserAdmin

Alex Arnaud authored 10 years ago and Julian Maurice committed 10 years ago

dev#14946 - Don't show 'resnumerique' tab and link to add album in front if bibnum module is disabled

# Veuillez entrer un message de validation pour expliquer en quoi cette fusion est
# nécessaire, surtout si cela fusionne une branche amont mise à jour dans une branche de sujet.
#
# Les lignes commençant par '#' seront ignorées, et un message vide
# abandonne la validation.

Merge branch 'display_day_of_week_in_events' of http://git.afi-sa.fr/llaffont/opacce into llaffont/opacce-display_day_of_week_in_events

Conflicts:
	application/modules/opac/controllers/CmsController.php
	tests/application/modules/opac/controllers/CmsControllerTest.php

Conflicts:
	library/Class/Article.php
	library/Class/ArticleCategorie.php
	library/Class/Catalogue.php
	library/Class/Sitotheque.php

Conflicts:
	application/modules/admin/controllers/CmsController.php
	cosmogramme/php/_init.php
	library/Class/AdminVar.php
	library/Class/ArticleCategorie.php
	library/Class/Catalogue.php
	library/Class/TypeDoc.php
	library/Class/Users.php
	tests/application/modules/admin/controllers/CmsControllerTest.php

Conflicts:
	library/Class/Article.php
	library/Class/Catalogue.php
	library/Class/Sitotheque.php