[openmairie-framework-Commits] r5486 - in openmairie_exemple/branches/4.11.0-develop: . core

[ejpri...@users.adullact.net]

Author: ejpritchard
Date: 2026-02-25 12:20:16 +0100 (Wed, 25 Feb 2026)
New Revision: 5486

Modified:
openmairie_exemple/branches/4.11.0-develop/
openmairie_exemple/branches/4.11.0-develop/HISTORY.txt
openmairie_exemple/branches/4.11.0-develop/core/om_filestorage.class.php
Log:
merge : fix-bug-filestorage-var-export vers 4.11.0-develop

Index: openmairie_exemple/branches/4.11.0-develop
===================================================================
--- openmairie_exemple/branches/4.11.0-develop 2026-02-25 11:16:07 UTC (rev 5485)
+++ openmairie_exemple/branches/4.11.0-develop 2026-02-25 11:20:16 UTC (rev 5486)

Property changes on: openmairie_exemple/branches/4.11.0-develop
___________________________________________________________________
Modified: svn:mergeinfo
## -40,6 +40,7 ##
/openmairie_exemple/branches/dbform-initialisation-val-en-mode-ajout:3547-3552
/openmairie_exemple/branches/export_csv:3508-3523
/openmairie_exemple/branches/fix-bug-dbform-resubmit-id:5448-5483
+/openmairie_exemple/branches/fix-bug-filestorage-var-export:5465-5485
/openmairie_exemple/branches/fix-bug-form-array-key:5446-5480
/openmairie_exemple/branches/gen_doc_rf:3556-3557
/openmairie_exemple/branches/inversion_controle_permissions:3699-3727
Modified: openmairie_exemple/branches/4.11.0-develop/HISTORY.txt
===================================================================
--- openmairie_exemple/branches/4.11.0-develop/HISTORY.txt 2026-02-25 11:16:07 UTC (rev 5485)
+++ openmairie_exemple/branches/4.11.0-develop/HISTORY.txt 2026-02-25 11:20:16 UTC (rev 5486)
@@ -8,6 +8,8 @@
- PHP Fatal error: Uncaught TypeError: array_search(): Argument #2 ($haystack) must be of t ype array, string given in core/om_formulaire.class.php:2960
- PHP Warning: Undefined array key "filename" in core/om_formulaire.class.php on line 4346
- PHP Warning: Undefined array key "form_resubmit_identifiers" in core/om_dbform.class.php on line 3915
+ - PHP Warning: var_export does not handle circular references in core/om_filestorage.class.php on line 444
+
* Correction : Optimiser les mots-clés RobotFramework générés par le générateur. Ticket #10856.



Modified: openmairie_exemple/branches/4.11.0-develop/core/om_filestorage.class.php
===================================================================
--- openmairie_exemple/branches/4.11.0-develop/core/om_filestorage.class.php 2026-02-25 11:16:07 UTC (rev 5485)
+++ openmairie_exemple/branches/4.11.0-develop/core/om_filestorage.class.php 2026-02-25 11:20:16 UTC (rev 5486)
@@ -448,7 +448,7 @@
if (! empty($alternate_storage_key = $this->getAltFsKeyFromUIDPrefix($uid))) {
logger::instance()->log(__METHOD__.'() alternate_storage_key: '.var_export($alternate_storage_key, true), EXTRA_VERBOSE_MODE);
$storage = $this->init_alternate_storage($alternate_storage_key);
- logger::instance()->log(__METHOD__.'() storage: '.var_export($storage, true), EXTRA_VERBOSE_MODE);
+ logger::instance()->log(__METHOD__.'() storage: '.(is_object($storage) ? get_class($storage) : var_export($storage, true)), EXTRA_VERBOSE_MODE);
// Pour récupérer l'uid correct il faut enlever le préfixe
$uid = $this->removePrefixFromUID($uid);
logger::instance()->log(__METHOD__.'() uid: '.var_export($uid, true), EXTRA_VERBOSE_MODE);