Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b69311e460bd52eebc4402a165c012e63121ef03 https://github.com/phpmyadmin/phpmyadmin/commit/b69311e460bd52eebc4402a165c0... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-16 (Wed, 16 Nov 2016)

Changed paths: M libraries/server_privileges.lib.php

Log Message: ----------- Fix self-injection in Table specific privileges

Don't manually add backticks (`) rather use the Util function, since escaping of backticks inside the column_name has to be handled too.

Fix #12361

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Commit: 88b284816cdcbb3783685785f887faa061d0bd07 https://github.com/phpmyadmin/phpmyadmin/commit/88b284816cdcbb3783685785f887... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-11-16 (Wed, 16 Nov 2016)

Changed paths: M ChangeLog

Log Message: ----------- ChangeLog for #12361

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Conflicts: ChangeLog

Commit: 80d1bc7c2b6c29b29fe6653ae54d34f8bbb828d4 https://github.com/phpmyadmin/phpmyadmin/commit/80d1bc7c2b6c29b29fe6653ae54d... Author: Michal Čihař michal@cihar.com Date: 2016-11-16 (Wed, 16 Nov 2016)

Changed paths: M ChangeLog M libraries/server_privileges.lib.php

Log Message: ----------- Merge pull request #12711 from devenbansod/fix_12361

Fix #12361 : Fix self SQL injection in table-specific privileges

Commit: 050e9ebf61d051cc45a57fd3eacee7b6669319ed https://github.com/phpmyadmin/phpmyadmin/commit/050e9ebf61d051cc45a57fd3eace... Author: Marc Delisle marc@infomarc.info Date: 2016-11-16 (Wed, 16 Nov 2016)

Changed paths: M po/fr.po

Log Message: ----------- Translated using Weblate (French)

Currently translated at 99.4% (3205 of 3222 strings)

[CI skip]

Commit: e7b19f2a2ccc2848ee28b5c0171fd3370bc33e22 https://github.com/phpmyadmin/phpmyadmin/commit/e7b19f2a2ccc2848ee28b5c0171f... Author: Weblate noreply@weblate.org Date: 2016-11-16 (Wed, 16 Nov 2016)

Changed paths: M ChangeLog M libraries/server_privileges.lib.php

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6

Commit: 625fa53f8bda325c1ecc59640f969bc94df30ac3 https://github.com/phpmyadmin/phpmyadmin/commit/625fa53f8bda325c1ecc59640f96... Author: Michal Čihař michal@cihar.com Date: 2016-11-16 (Wed, 16 Nov 2016)

Changed paths: M ChangeLog M libraries/server_privileges.lib.php

Log Message: ----------- Merge commit '80d1bc7c2b6c29b29fe6653ae54d34f8bbb828d4'

Commit: 1722306a4b7a51975ebd95ac954e5c024326483f https://github.com/phpmyadmin/phpmyadmin/commit/1722306a4b7a51975ebd95ac954e... Author: Michal Čihař michal@cihar.com Date: 2016-11-16 (Wed, 16 Nov 2016)

Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9e752595f065...1722306a4b7a