Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 96f5f101cc6db57abaea88f4ff5015f1839a2c8e
https://github.com/phpmyadmin/phpmyadmin/commit/96f5f101cc6db57abaea88f4ff5015f1839a2c8e
Author: Deven Bansod <devenbansod.b...@gmail.com>
Date: 2016-08-26 (Fri, 26 Aug 2016)
Changed paths:
M libraries/Advisor.php
Log Message:
-----------
Add error checking in reading the advisory_rules file
If the file does not exist or if it is not readable by PHP, it can return FALSE.
In such cases, we should print a user-friendly message and return from parsing
the rules file.
Fix #12476
Signed-off-by: Deven Bansod <devenbansod.b...@gmail.com>
Commit: b3e7f10f2ed8949512b623cac4055de86fe368fc
https://github.com/phpmyadmin/phpmyadmin/commit/b3e7f10f2ed8949512b623cac4055de86fe368fc
Author: Deven Bansod <devenbansod.b...@gmail.com>
Date: 2016-08-26 (Fri, 26 Aug 2016)
Changed paths:
M libraries/common.inc.php
Log Message:
-----------
Check if the indices are present and map to a string value
Fix #12477
The indices may not be present in the json_decode result, or might not be
strings
Signed-off-by: Deven Bansod <devenbansod.b...@gmail.com>
Commit: d7181d1b5a35bf91053d74babf1a3cef666d894e
https://github.com/phpmyadmin/phpmyadmin/commit/d7181d1b5a35bf91053d74babf1a3cef666d894e
Author: Deven Bansod <devenbansod.b...@gmail.com>
Date: 2016-08-26 (Fri, 26 Aug 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
ChangeLog entries for #12476 and #12477
Signed-off-by: Deven Bansod <devenbansod.b...@gmail.com>
Commit: dd34ca8512fb49ff841f2d3f947db67dcff45765
https://github.com/phpmyadmin/phpmyadmin/commit/dd34ca8512fb49ff841f2d3f947db67dcff45765
Author: Deven Bansod <devenbansod.b...@gmail.com>
Date: 2016-08-26 (Fri, 26 Aug 2016)
Changed paths:
M ChangeLog
M libraries/Advisor.php
M libraries/common.inc.php
Log Message:
-----------
Merge branch 'QA_4_6'
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/d5c3302fb403...dd34ca8512fb_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git
