[phpMyAdmin Git] [phpmyadmin/phpmyadmin] c55755: Fix merge conflicts in QA_4_8 from this pull request

[Andy Baugh]

Branch: refs/heads/QA_4_8
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: c55755d0ca9cb58371f9d6f667aa3dc4be984400
https://github.com/phpmyadmin/phpmyadmin/commit/c55755d0ca9cb58371f9d6f667aa3dc4be984400
Author: Andy Baugh <thomas.baugh at cpanel.net>
Date: 2018-08-06 (Mon, 08 August 2018) -04:00

Changed paths: 
M libraries/classes/Rte/Events.php
M libraries/classes/Rte/General.php
M libraries/classes/Rte/Routines.php
M libraries/classes/Rte/Triggers.php

Log Message:
-----------
Fix merge conflicts in QA_4_8 from this pull request

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>

Fix bad callers to getError where null was being passed.

Fixes #14552: Considering how function signatures work in PHP, this should
be a reltatively 'safe' change, as the mysqli lib currently would still
do a check for cases where the passed in $link was either null or false.
Otherwise the bug's source appears to be a common mistake in PHP:
null != undefined

Signed-off-by: Andy Baugh <thomas.baugh at cpanel.net>

Commit: 8bcbb950dde510cf3cc56027c2d3a1773c542add
https://github.com/phpmyadmin/phpmyadmin/commit/8bcbb950dde510cf3cc56027c2d3a1773c542add
Author: Isaac Bennetch <bennetch at gmail.com>
Date: 2018-08-06 (Mon, 08 August 2018) -04:00

Changed paths: 
M ChangeLog

Log Message:
-----------
Add ChangeLog for issue #14552

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>