version 7.5.11

Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master

Conflicts:
	VERSIONS
	library/startup.php

VERSIONS

+18/02/2016 - v7.5.11
+
+ - ticket #38716 : correction du répertoire de sauvegarde des images de captcha
+
+
+
 16/02/2016 - v7.5.10
 
  - ticket #37996 : Correction des liens Premier Chapitre

library/startup.php

@@ -65,7 +65,7 @@ function defineConstant($name, $value) {
 function setupConstants() {
   defineConstant('BOKEH_MAJOR_VERSION','7.5');
 
-  defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.10');
+  defineConstant('BOKEH_RELEASE_NUMBER', BOKEH_MAJOR_VERSION . '.11');
 
   defineConstant('BOKEH_REMOTE_FILES', 'http://git.afi-sa.fr/afi/opacce/');
 
@@ -112,8 +112,8 @@ function setupConstants() {
   defineConstant('PATH_ADMIN_SUPPORTS', ROOT_PATH . 'public/admin/images/supports/');
 
   defineConstant('PATH_FONTS', ROOT_PATH . 'public/opac/fonts/');
-  defineConstant('URL_CAPTCHA', BASE_URL . '/public/captcha/');
-  defineConstant('PATH_CAPTCHA', ROOT_PATH . 'public/captcha/');
+  defineConstant('URL_CAPTCHA', BASE_URL . '/temp/');
+  defineConstant('PATH_CAPTCHA', PATH_TEMP);
   defineConstant('CACHE_LIFETIME', 3600);
   defineConstant('MEMCACHED_ENABLE', false);
   defineConstant('MEMCACHED_HOST', 'localhost');