MDL-52286 core: mute erros in adodb destructor

diff --git a/lib/adodb/adodb.inc.php b/lib/adodb/adodb.inc.php
index eec531b..82dcd02 100644 (file)
--- a/lib/adodb/adodb.inc.php
+++ b/lib/adodb/adodb.inc.php
@@ -3250,7 +3250,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
        }
 
        function __destruct() {
-               $this->Close();
+               @$this->Close();
        }
 
        function getIterator() {

diff --git a/lib/adodb/readme_moodle.txt b/lib/adodb/readme_moodle.txt
index 3d22458..db762b1 100644 (file)
--- a/lib/adodb/readme_moodle.txt
+++ b/lib/adodb/readme_moodle.txt
@@ -25,6 +25,7 @@ Added:
 Our changes:
  * Removed random seed initialization from lib/adodb/adodb.inc.php:216 (see 038f546 and MDL-41198).
  * MDL-52286 fixed usage of /e in preg_replace, incorrect constructor in ADORecordSet_ext_mysqlt
-   and ADORecordSet_mysqli::_close(). Check if fixed upstream during the next upgrade and remove this line.
+   and ADORecordSet_mysqli::_close(), added muting erros in ADORecordSet::__destruct().
+   Check if fixed upstream during the next upgrade and remove this note.
 
 skodak, iarenaza, moodler, stronk7