Skip to content
Snippets Groups Projects
Commit c3fb97bf authored by Ghislain Loas's avatar Ghislain Loas
Browse files

Merge branch 'stable' into 'hotline-master'

Stable

See merge request !1480
parents ca5f37b1 afe79101
Branches
Tags
7 merge requests!1587Master,!1553Master,!1519Master,!1506Master,!1502Master,!1491Master,!1490Hotline master
- ticket #38223 : Intégration cosmogramme : correction d'une incompatibilité avec la version 5.4.45 de PHP
......@@ -39,10 +39,9 @@ class Class_Cosmogramme_Integration_Chronometre {
public function backToLegacyState($main, $on_file, $on_records) {
foreach ([$main => $this->_main,
$on_file => $this->_on_file,
$on_records => $this->_on_records] as $legacy => $internal)
$legacy->timeStart = $internal->getStart();
$main->timeStart = $this->_main->getStart();
$on_file->timeStart = $this->_on_file->getStart();
$on_records->timeStart = $this->_on_records->getStart();
}
......
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