On Sun, 15 Apr 2018 01:55:56 -0700, Nye Liu wrote: > --- sql.lib.php.dist 2018-04-15 01:55:18.675402718 -0700 > +++ sql.lib.php 2018-04-15 01:53:46.787216745 -0700 > @@ -610,7 +610,7 @@ > || $analyzed_sql_results['is_analyse']) > && $analyzed_sql_results['select_from'] > && ((empty($analyzed_sql_results['select_expr'])) > - || (count($analyzed_sql_results['select_expr'] == 1) > + || (count($analyzed_sql_results['select_expr']) == 1 > && ($analyzed_sql_results['select_expr'][0] == '*'))) > && count($analyzed_sql_results['select_tables']) == 1; > }
Thanks. Here's the same as a complete debdiff. I wanted to help by uploading an NMU but phpmyadmin fails to build in unstable with php 7.3. And also with 7.2 in testing. Will file a bug later ... Cheers, gregor, from the Bern BSP -- .''`. https://info.comodo.priv.at -- Debian Developer https://www.debian.org : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D 85FA BB3A 6801 8649 AA06 `. `' Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe `-
diff -Nru phpmyadmin-4.6.6/debian/changelog phpmyadmin-4.6.6/debian/changelog --- phpmyadmin-4.6.6/debian/changelog 2017-07-10 12:43:06.000000000 +0200 +++ phpmyadmin-4.6.6/debian/changelog 2018-12-01 15:01:45.000000000 +0100 @@ -1,3 +1,16 @@ +phpmyadmin (4:4.6.6-5.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Fix "warnings when running under php 7.2, apparently fixed by new + upstream series 4.7.x": + Add patch to fix syntax error in usage of the count() function in + libraries/sql.lib.php. + Thanks to Nye Liu for adding the patch, which can also be found on the + upstream bug tracker, to the BTS. + (Closes: #890595) + + -- gregor herrmann <gre...@debian.org> Sat, 01 Dec 2018 15:01:45 +0100 + phpmyadmin (4:4.6.6-5) unstable; urgency=medium * Add alternate dependency to php-mysqli. This seems to help in case people diff -Nru phpmyadmin-4.6.6/debian/patches/count_parameter_must_be_an_array.patch phpmyadmin-4.6.6/debian/patches/count_parameter_must_be_an_array.patch --- phpmyadmin-4.6.6/debian/patches/count_parameter_must_be_an_array.patch 1970-01-01 01:00:00.000000000 +0100 +++ phpmyadmin-4.6.6/debian/patches/count_parameter_must_be_an_array.patch 2018-12-01 14:59:36.000000000 +0100 @@ -0,0 +1,19 @@ +Description: fix error in count() usage +Origin: vendor +Bug: https://github.com/phpmyadmin/phpmyadmin/issues/14332 +Bug-Debian: https://bugs.debian.org/890595 +Forwarded: not-needed +Author: gregor herrmann <gre...@debian.org> +Last-Update: 2018-12-01 + +--- a/libraries/sql.lib.php ++++ b/libraries/sql.lib.php +@@ -610,7 +610,7 @@ + || $analyzed_sql_results['is_analyse']) + && $analyzed_sql_results['select_from'] + && ((empty($analyzed_sql_results['select_expr'])) +- || (count($analyzed_sql_results['select_expr'] == 1) ++ || (count($analyzed_sql_results['select_expr']) == 1 + && ($analyzed_sql_results['select_expr'][0] == '*'))) + && count($analyzed_sql_results['select_tables']) == 1; + } diff -Nru phpmyadmin-4.6.6/debian/patches/series phpmyadmin-4.6.6/debian/patches/series --- phpmyadmin-4.6.6/debian/patches/series 2017-04-07 19:21:37.000000000 +0200 +++ phpmyadmin-4.6.6/debian/patches/series 2018-12-01 14:56:59.000000000 +0100 @@ -1,2 +1,3 @@ Truncate-only-long-passwords.patch debian.patch +count_parameter_must_be_an_array.patch
signature.asc
Description: Digital Signature
