- Git - lists.phpmyadmin.net

[phpmyadmin/docker]
by nijel 08 Jun '16

08 Jun '16

Branch: refs/tags/4.6.2-2 Home: https://github.com/phpmyadmin/docker

1 0

[phpmyadmin/phpmyadmin] e6ff15: The session_destroy is already called on logout
by Michal Čihař 08 Jun '16

08 Jun '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e6ff157ddabd3840bb652e9c7e918d7f6c162319 https://github.com/phpmyadmin/phpmyadmin/commit/e6ff157ddabd3840bb652e9c7e9… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M libraries/plugins/auth/AuthenticationHttp.php Log Message: ----------- The session_destroy is already called on logout Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 34c0bf: Translated using Weblate (Punjabi)
by Weblate 08 Jun '16

08 Jun '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 34c0bf1afde8a1b994b1085535103f3885b8aa97 https://github.com/phpmyadmin/phpmyadmin/commit/34c0bf1afde8a1b994b10855351… Author: Satnam S Virdi <pika10singh(a)gmail.com> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M po/pa.po Log Message: ----------- Translated using Weblate (Punjabi) Currently translated at 3.1% (101 of 3208 strings) [CI skip] Commit: 189c122413109e75b7a09a625fec0df631a00b85 https://github.com/phpmyadmin/phpmyadmin/commit/189c122413109e75b7a09a625fe… Author: Weblate <noreply(a)weblate.org> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M libraries/plugins/export/ExportSql.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0b2b23f2ce96...189c12241310

1 0

[phpmyadmin/phpmyadmin] f80191: Translated using Weblate (Punjabi)
by Michal Čihař 08 Jun '16

08 Jun '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f8019149444c82c5afa2254fd16165f339991ccb https://github.com/phpmyadmin/phpmyadmin/commit/f8019149444c82c5afa2254fd16… Author: Satnam S Virdi <pika10singh(a)gmail.com> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M po/pa.po Log Message: ----------- Translated using Weblate (Punjabi) Currently translated at 3.1% (101 of 3209 strings) [CI skip] Commit: d7fcbab1cda7432a78ec5f02ebb362bdfbdf677c https://github.com/phpmyadmin/phpmyadmin/commit/d7fcbab1cda7432a78ec5f02ebb… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M libraries/plugins/export/ExportSql.php Log Message: ----------- Ensure we parse query for views as well Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: b7492d80c0467dc31cb7f50e151bd980fe0ac1ca https://github.com/phpmyadmin/phpmyadmin/commit/b7492d80c0467dc31cb7f50e151… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-06-08 (Wed, 08 Jun 2016) Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_6' Commit: 0b2b23f2ce96accc8657a2189c3df2ece2283294 https://github.com/phpmyadmin/phpmyadmin/commit/0b2b23f2ce96accc8657a2189c3… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M libraries/plugins/export/ExportSql.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d4932fbb883f...0b2b23f2ce96

1 0

[phpmyadmin/phpmyadmin] d7fcba: Ensure we parse query for views as well
by Michal Čihař 08 Jun '16

08 Jun '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: d7fcbab1cda7432a78ec5f02ebb362bdfbdf677c https://github.com/phpmyadmin/phpmyadmin/commit/d7fcbab1cda7432a78ec5f02ebb… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M libraries/plugins/export/ExportSql.php Log Message: ----------- Ensure we parse query for views as well Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] f80191: Translated using Weblate (Punjabi)
by Satnam S Virdi 08 Jun '16

08 Jun '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f8019149444c82c5afa2254fd16165f339991ccb https://github.com/phpmyadmin/phpmyadmin/commit/f8019149444c82c5afa2254fd16… Author: Satnam S Virdi <pika10singh(a)gmail.com> Date: 2016-06-08 (Wed, 08 Jun 2016) Changed paths: M po/pa.po Log Message: ----------- Translated using Weblate (Punjabi) Currently translated at 3.1% (101 of 3209 strings) [CI skip]

1 0

[phpmyadmin/phpmyadmin] 1c77a4: Fix #12281 Copying a user resets SSL to None
by Madhura Jayaratne 06 Jun '16

06 Jun '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1c77a4ef0dbd7af493018b942f8bd46e38871c93 https://github.com/phpmyadmin/phpmyadmin/commit/1c77a4ef0dbd7af493018b942f8… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: ----------- Fix #12281 Copying a user resets SSL to None Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: c4e7447a965ca50f53a947df7f24f72e86154b53 https://github.com/phpmyadmin/phpmyadmin/commit/c4e7447a965ca50f53a947df7f2… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M ChangeLog M js/pmd/move.js M libraries/Error.php M libraries/dbi/DBIMysqli.php M po/pt_BR.po M test/classes/ErrorTest.php Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into bug12281 Conflicts: ChangeLog Commit: c2322a637dc1e01322817618f9c5a529e184ce7f https://github.com/phpmyadmin/phpmyadmin/commit/c2322a637dc1e01322817618f9c… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: ----------- Merge pull request #12296 from madhuracj/bug12281 Fix #12281 Copying a user resets SSL to None Commit: d4932fbb883f100b40611b0d46a866efb9257107 https://github.com/phpmyadmin/phpmyadmin/commit/d4932fbb883f100b40611b0d46a… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7a6632075336...d4932fbb883f

1 0

[phpmyadmin/phpmyadmin] 1c77a4: Fix #12281 Copying a user resets SSL to None
by Madhura Jayaratne 06 Jun '16

06 Jun '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1c77a4ef0dbd7af493018b942f8bd46e38871c93 https://github.com/phpmyadmin/phpmyadmin/commit/1c77a4ef0dbd7af493018b942f8… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: ----------- Fix #12281 Copying a user resets SSL to None Signed-off-by: Madhura Jayaratne <madhura.cj(a)gmail.com> Commit: c4e7447a965ca50f53a947df7f24f72e86154b53 https://github.com/phpmyadmin/phpmyadmin/commit/c4e7447a965ca50f53a947df7f2… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M ChangeLog M js/pmd/move.js M libraries/Error.php M libraries/dbi/DBIMysqli.php M po/pt_BR.po M test/classes/ErrorTest.php Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into bug12281 Conflicts: ChangeLog Commit: c2322a637dc1e01322817618f9c5a529e184ce7f https://github.com/phpmyadmin/phpmyadmin/commit/c2322a637dc1e01322817618f9c… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M ChangeLog M libraries/server_privileges.lib.php Log Message: ----------- Merge pull request #12296 from madhuracj/bug12281 Fix #12281 Copying a user resets SSL to None Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4fd270965082...c2322a637dc1

1 0

[phpmyadmin/phpmyadmin] 4fd270: Avoid rewriting PHP stack frames
by Michal Čihař 06 Jun '16

06 Jun '16

Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4fd270965082ae17c3ac027dcbb5926244b03c9e https://github.com/phpmyadmin/phpmyadmin/commit/4fd270965082ae17c3ac027dcbb… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M ChangeLog M libraries/Error.php M test/classes/ErrorTest.php Log Message: ----------- Avoid rewriting PHP stack frames Surprisingly PHP stack frames are passed as references to the error handling code, thus changing value there leads to changing value in the executed code. With MySQL issuing warning about incompatible version (different runtime library than compile time), handling this warning rewrites current stack frame and the mysql_real_connect later sees parameters as processed by Error class for display. We now create copy of the stacktrace to avoid this. Fixes #12279 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] 4fd270: Avoid rewriting PHP stack frames
by Michal Čihař 06 Jun '16

06 Jun '16

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4fd270965082ae17c3ac027dcbb5926244b03c9e https://github.com/phpmyadmin/phpmyadmin/commit/4fd270965082ae17c3ac027dcbb… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M ChangeLog M libraries/Error.php M test/classes/ErrorTest.php Log Message: ----------- Avoid rewriting PHP stack frames Surprisingly PHP stack frames are passed as references to the error handling code, thus changing value there leads to changing value in the executed code. With MySQL issuing warning about incompatible version (different runtime library than compile time), handling this warning rewrites current stack frame and the mysql_real_connect later sees parameters as processed by Error class for display. We now create copy of the stacktrace to avoid this. Fixes #12279 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 7a6632075336c8ca15e41094d63650442f8fe9d6 https://github.com/phpmyadmin/phpmyadmin/commit/7a6632075336c8ca15e41094d63… Author: Michal Čihař <michal(a)cihar.com> Date: 2016-06-06 (Mon, 06 Jun 2016) Changed paths: M ChangeLog M libraries/Error.php M test/classes/ErrorTest.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5bc426742dce...7a6632075336

1 0