Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f3babbb945ec54f55969e16191f3f2e9a13a2f74 https://github.com/phpmyadmin/phpmyadmin/commit/f3babbb945ec54f55969e16191f3... Author: Michal Čihař michal@cihar.com Date: 2016-08-30 (Tue, 30 Aug 2016)

Changed paths: M libraries/Linter.php

Log Message: ----------- Correctly calculate string length

Fixes #12517

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 89fc40a1ce7e2cf07c20c2254d8426044011f7a6 https://github.com/phpmyadmin/phpmyadmin/commit/89fc40a1ce7e2cf07c20c2254d84... Author: Michal Čihař michal@cihar.com Date: 2016-08-30 (Tue, 30 Aug 2016)

Changed paths: M libraries/Linter.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5c8972563a05...89fc40a1ce7e