Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 793b062d572936b86b7d7278a22a9f430f31c6b2 https://github.com/phpmyadmin/phpmyadmin/commit/793b062d572936b86b7d7278a22a... Author: Andy Baugh <thomas.baugh@cpanel.net> Date: 2018-08-06 (Mon, 08 August 2018) -05: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 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@cpanel.net> Commit: c55755d0ca9cb58371f9d6f667aa3dc4be984400 https://github.com/phpmyadmin/phpmyadmin/commit/c55755d0ca9cb58371f9d6f667aa... Author: Andy Baugh <thomas.baugh@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@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@cpanel.net> Commit: 6e9c8f8b337cf984f21ae61be06ed558247a71c0 https://github.com/phpmyadmin/phpmyadmin/commit/6e9c8f8b337cf984f21ae61be06e... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2018-08-06 (Mon, 08 August 2018) -04:00 Changed paths: Log Message: ----------- Merge branch 'QA_4_8' Commit: 8bcbb950dde510cf3cc56027c2d3a1773c542add https://github.com/phpmyadmin/phpmyadmin/commit/8bcbb950dde510cf3cc56027c2d3... Author: Isaac Bennetch <bennetch@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@gmail.com> Commit: 1d1ab00381e099d6790ad6b04082c51d7d30b894 https://github.com/phpmyadmin/phpmyadmin/commit/1d1ab00381e099d6790ad6b04082... Author: Isaac Bennetch <bennetch@gmail.com> Date: 2018-08-06 (Mon, 08 August 2018) -04:00 Changed paths: M ChangeLog Log Message: ----------- Merge branch 'QA_4_8'