Branch: refs/heads/STABLE
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 5c6ec27eea8eef206c05c5fb2f8c51086654cda6
https://github.com/phpmyadmin/phpmyadmin/commit/5c6ec27eea8eef206c05c5fb2f8c51086654cda6
Author: Isaac Bennetch <benne...@gmail.com>
Date: 2016-05-25 (Wed, 25 May 2016)
Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/Config.php
Log Message:
-----------
Prepare for 4.6.3-dev
Signed-off-by: Isaac Bennetch <benne...@gmail.com>
Commit: b56df997316967f770f54bf00fe1418ca11a8994
https://github.com/phpmyadmin/phpmyadmin/commit/b56df997316967f770f54bf00fe1418ca11a8994
Author: Kristjan Räts <kristjanr...@gmail.com>
Date: 2016-05-26 (Thu, 26 May 2016)
Changed paths:
M po/et.po
Log Message:
-----------
Translated using Weblate (Estonian)
Currently translated at 100.0% (3209 of 3209 strings)
[CI skip]
Commit: e72c1d4da95e549b7329b30b3561a7d4caacc5a4
https://github.com/phpmyadmin/phpmyadmin/commit/e72c1d4da95e549b7329b30b3561a7d4caacc5a4
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-05-26 (Thu, 26 May 2016)
Changed paths:
M test/classes/ConfigTest.php
Log Message:
-----------
Add more tests for getCookiePath (issue #12249)
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: d78e173b34b2a318677e30900a4399b53d9b28b3
https://github.com/phpmyadmin/phpmyadmin/commit/d78e173b34b2a318677e30900a4399b53d9b28b3
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-05-27 (Fri, 27 May 2016)
Changed paths:
M ChangeLog
M libraries/Config.php
M test/classes/ConfigTest.php
Log Message:
-----------
Do not use dirname for calculating cookie path
It is wrong for this purpose as on Windows this uses \ for both
separating parts and generating result. This fixed calculation of cookie
path on Windows.
Fixes #12249
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 8e146b35b53129efa715769787f9e946eafdcea7
https://github.com/phpmyadmin/phpmyadmin/commit/8e146b35b53129efa715769787f9e946eafdcea7
Author: João Carlos Barsan <joao_bar...@hotmail.com>
Date: 2016-05-28 (Sat, 28 May 2016)
Changed paths:
M po/pt_BR.po
Log Message:
-----------
Translated using Weblate (Portuguese (Brazil))
Currently translated at 93.0% (2987 of 3209 strings)
[CI skip]
Commit: 5cadea99fc750b91964394d2319765a350c0c603
https://github.com/phpmyadmin/phpmyadmin/commit/5cadea99fc750b91964394d2319765a350c0c603
Author: Renan Souza do Nascimento <renan...@icloud.com>
Date: 2016-05-30 (Mon, 30 May 2016)
Changed paths:
M po/pt_BR.po
Log Message:
-----------
Translated using Weblate (Portuguese (Brazil))
Currently translated at 93.2% (2992 of 3209 strings)
[CI skip]
Commit: f9fed9ca2fb048262e8a61e062dae434182263ae
https://github.com/phpmyadmin/phpmyadmin/commit/f9fed9ca2fb048262e8a61e062dae434182263ae
Author: Microgamer <microgamer.develo...@gmail.com>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M po/de.po
Log Message:
-----------
Translated using Weblate (German)
Currently translated at 100.0% (3209 of 3209 strings)
[CI skip]
Commit: 48225526041a9767a1e139ac19e2ba0f28f89be6
https://github.com/phpmyadmin/phpmyadmin/commit/48225526041a9767a1e139ac19e2ba0f28f89be6
Author: Charles Kane <kane...@gmail.com>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M po/zh_CN.po
Log Message:
-----------
Translated using Weblate (Chinese (China))
Currently translated at 88.0% (2824 of 3209 strings)
[CI skip]
Commit: d11185f5dec952d01af731f4a61ba413319fea63
https://github.com/phpmyadmin/phpmyadmin/commit/d11185f5dec952d01af731f4a61ba413319fea63
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-03 (Fri, 03 Jun 2016)
Changed paths:
M ChangeLog
M libraries/dbi/DBIMysqli.php
Log Message:
-----------
Fixed error reporting on connect problems
The mysqli_real_connect seems to return NULL on invalid parameters, so
we need to handle it as well. This doesn't seem to be documented
anywhere.
Issue #12279
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: b49030528fc68bc416bc7c4471c7600dc18af881
https://github.com/phpmyadmin/phpmyadmin/commit/b49030528fc68bc416bc7c4471c7600dc18af881
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-03 (Fri, 03 Jun 2016)
Changed paths:
M ChangeLog
M libraries/plugins/export/ExportSql.php
Log Message:
-----------
Fixed export of tables without explicitly set engine
Fixes #12290
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 2ae8b9248e49d0ed55ea86df3ae53ef5559258ee
https://github.com/phpmyadmin/phpmyadmin/commit/2ae8b9248e49d0ed55ea86df3ae53ef5559258ee
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-03 (Fri, 03 Jun 2016)
Changed paths:
M libraries/DatabaseInterface.php
M libraries/dbi/DBIMysql.php
M libraries/dbi/DBIMysqli.php
Log Message:
-----------
Simplify server port handling
The intval function does return 0 for empty string, so we really do not
have to special case here.
Issue #12279
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: aec1f4b3c5f14b800629956b409c9df6fe234013
https://github.com/phpmyadmin/phpmyadmin/commit/aec1f4b3c5f14b800629956b409c9df6fe234013
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2016-06-05 (Sun, 05 Jun 2016)
Changed paths:
M ChangeLog
M js/pmd/move.js
Log Message:
-----------
Fix #12285 Designer JavaScript error: Show/Hide tables list
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: 73ce5087122b086bef2b1e265762d9eeb001919a
https://github.com/phpmyadmin/phpmyadmin/commit/73ce5087122b086bef2b1e265762d9eeb001919a
Author: Deven Bansod <devenbansod.b...@gmail.com>
Date: 2016-06-05 (Sun, 05 Jun 2016)
Changed paths:
M js/pmd/move.js
Log Message:
-----------
Fix error in Designer saved default state of all tables
Signed-off-by: Deven Bansod <devenbansod.b...@gmail.com>
Commit: 7fb046e207fe6e9526f54556bdfdbe88ae519d0e
https://github.com/phpmyadmin/phpmyadmin/commit/7fb046e207fe6e9526f54556bdfdbe88ae519d0e
Author: Deven Bansod <devenban...@users.noreply.github.com>
Date: 2016-06-05 (Sun, 05 Jun 2016)
Changed paths:
M js/pmd/move.js
Log Message:
-----------
Merge pull request #12294 from devenbansod/fix_designer_save_state
Fix error in Designer saved default state of all tables
Commit: f4ac05762fa2c49190910f7868547d7373bb7810
https://github.com/phpmyadmin/phpmyadmin/commit/f4ac05762fa2c49190910f7868547d7373bb7810
Author: Guilherme Rocha <guilhe...@candiba.net>
Date: 2016-06-06 (Mon, 06 Jun 2016)
Changed paths:
M po/pt_BR.po
Log Message:
-----------
Translated using Weblate (Portuguese (Brazil))
Currently translated at 93.3% (2995 of 3209 strings)
[CI skip]
Commit: 171bcb9a85bbb6ffb7d0a6c4b0cbdb5f7ded9387
https://github.com/phpmyadmin/phpmyadmin/commit/171bcb9a85bbb6ffb7d0a6c4b0cbdb5f7ded9387
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-06 (Mon, 06 Jun 2016)
Changed paths:
M ChangeLog
M libraries/dbi/DBIMysqli.php
Log Message:
-----------
Fix MySQL SSL connection with some PHP versions
It seems that for some PHP versions this flag is needed even though it's
not documented like this. Anyway this flag doesn't cause any harm, so
lets keep it enabled.
Issue #12293
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 5e536ab5f9fa19b288d32b2eddb7546c73f9efb2
https://github.com/phpmyadmin/phpmyadmin/commit/5e536ab5f9fa19b288d32b2eddb7546c73f9efb2
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-06 (Mon, 06 Jun 2016)
Changed paths:
M libraries/dbi/DBIMysqli.php
Log Message:
-----------
Do not set key if not set in config
Issue #12293
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 4fd270965082ae17c3ac027dcbb5926244b03c9e
https://github.com/phpmyadmin/phpmyadmin/commit/4fd270965082ae17c3ac027dcbb5926244b03c9e
Author: Michal Čihař <mic...@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ř <mic...@cihar.com>
Commit: 1c77a4ef0dbd7af493018b942f8bd46e38871c93
https://github.com/phpmyadmin/phpmyadmin/commit/1c77a4ef0dbd7af493018b942f8bd46e38871c93
Author: Madhura Jayaratne <madhura...@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...@gmail.com>
Commit: c4e7447a965ca50f53a947df7f24f72e86154b53
https://github.com/phpmyadmin/phpmyadmin/commit/c4e7447a965ca50f53a947df7f24f72e86154b53
Author: Madhura Jayaratne <madhura...@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/c2322a637dc1e01322817618f9c5a529e184ce7f
Author: Madhura Jayaratne <madhura...@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: f8019149444c82c5afa2254fd16165f339991ccb
https://github.com/phpmyadmin/phpmyadmin/commit/f8019149444c82c5afa2254fd16165f339991ccb
Author: Satnam S Virdi <pika10si...@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/d7fcbab1cda7432a78ec5f02ebb362bdfbdf677c
Author: Michal Čihař <mic...@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ř <mic...@cihar.com>
Commit: 99f17c107e5ba705f71afc6ce8e649eeccba8ecb
https://github.com/phpmyadmin/phpmyadmin/commit/99f17c107e5ba705f71afc6ce8e649eeccba8ecb
Author: Gergő Felföldi <gergo...@gmail.com>
Date: 2016-06-09 (Thu, 09 Jun 2016)
Changed paths:
M po/hu.po
Log Message:
-----------
Translated using Weblate (Hungarian)
Currently translated at 95.8% (3075 of 3209 strings)
[CI skip]
Commit: 43fdcb67ee34469f537ff617f3be17ba6ab0f75d
https://github.com/phpmyadmin/phpmyadmin/commit/43fdcb67ee34469f537ff617f3be17ba6ab0f75d
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-09 (Thu, 09 Jun 2016)
Changed paths:
M libraries/plugins/export/ExportJson.php
Log Message:
-----------
Include phpMyAdmin version in JSON dump
This provides useful information, the 0.1 string was not really helpful.
Issue #12304
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: b261ecae2558b7ac9d225c1662f68310c47efeee
https://github.com/phpmyadmin/phpmyadmin/commit/b261ecae2558b7ac9d225c1662f68310c47efeee
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-09 (Thu, 09 Jun 2016)
Changed paths:
M test/libraries/common/PMA_formatNumberByteDown_test.php
Log Message:
-----------
Add test for possible rounding issues
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 763683b4fe444b573185f729a8b9537a72a26404
https://github.com/phpmyadmin/phpmyadmin/commit/763683b4fe444b573185f729a8b9537a72a26404
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-09 (Thu, 09 Jun 2016)
Changed paths:
M test/classes/plugin/export/ExportJsonTest.php
Log Message:
-----------
Fix test expectations
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 3c6675b3f9464acf5c8a3a8eb2449a481c199bcb
https://github.com/phpmyadmin/phpmyadmin/commit/3c6675b3f9464acf5c8a3a8eb2449a481c199bcb
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-09 (Thu, 09 Jun 2016)
Changed paths:
M ChangeLog
M libraries/ServerStatusData.php
Log Message:
-----------
Fix division by zero in case of misconfigured MySQL server
Fixes #12308
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: baaa6c63be5a55bfad2868ed0b40f71be3593102
https://github.com/phpmyadmin/phpmyadmin/commit/baaa6c63be5a55bfad2868ed0b40f71be3593102
Author: Jocelyn Flament <jocelyn.flam...@gmail.com>
Date: 2016-06-12 (Sun, 12 Jun 2016)
Changed paths:
M po/fr.po
Log Message:
-----------
Translated using Weblate (French)
Currently translated at 99.8% (3203 of 3209 strings)
[CI skip]
Commit: c8823e24e7c1a37f78f45fd1ab24d310014e6f19
https://github.com/phpmyadmin/phpmyadmin/commit/c8823e24e7c1a37f78f45fd1ab24d310014e6f19
Author: Xavier Navarro <xvnava...@gmail.com>
Date: 2016-06-13 (Mon, 13 Jun 2016)
Changed paths:
M po/ca.po
Log Message:
-----------
Translated using Weblate (Catalan)
Currently translated at 100.0% (3209 of 3209 strings)
[CI skip]
Commit: 2d7d2d2e8b084e4410b5c9c7a9947b3fcdcffc5e
https://github.com/phpmyadmin/phpmyadmin/commit/2d7d2d2e8b084e4410b5c9c7a9947b3fcdcffc5e
Author: Bruno Henrique <bruno.henri...@ceepcascavel.com.br>
Date: 2016-06-13 (Mon, 13 Jun 2016)
Changed paths:
M po/pt_BR.po
Log Message:
-----------
Translated using Weblate (Portuguese (Brazil))
Currently translated at 93.3% (2996 of 3209 strings)
[CI skip]
Commit: 0caecf5fc894db9d904fe1e62d05888edd664038
https://github.com/phpmyadmin/phpmyadmin/commit/0caecf5fc894db9d904fe1e62d05888edd664038
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-13 (Mon, 13 Jun 2016)
Changed paths:
M js/server_variables.js
Log Message:
-----------
Correct error handling when editing variable fails
Issue #12317
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: b5faeb3c27c05b0ab3349272e51cfe053913e5e9
https://github.com/phpmyadmin/phpmyadmin/commit/b5faeb3c27c05b0ab3349272e51cfe053913e5e9
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-13 (Mon, 13 Jun 2016)
Changed paths:
M ChangeLog
M js/server_variables.js
M templates/server/variables/variable_row.phtml
Log Message:
-----------
Fixed editing of server variable
We now store verbatim variable name in HTML to avoid need to do some
magical transformations when parsing it.
Fixes #12317
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 79a34ff94cf801b7a158171b19b9cf98060d3f96
https://github.com/phpmyadmin/phpmyadmin/commit/79a34ff94cf801b7a158171b19b9cf98060d3f96
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-14 (Tue, 14 Jun 2016)
Changed paths:
M ChangeLog
M libraries/controllers/database/DatabaseStructureController.php
M test/classes/controllers/DatabaseStructureControllerTest.php
Log Message:
-----------
Calculate table size as integer
It should be big enough on 64-bit systems, so avoid rounding issues
which double calculations can bring.
Fixes #12303
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: d76496ba1d11de13ba1f982a462e014f9d923b29
https://github.com/phpmyadmin/phpmyadmin/commit/d76496ba1d11de13ba1f982a462e014f9d923b29
Author: Isaac Bennetch <benne...@gmail.com>
Date: 2016-06-14 (Tue, 14 Jun 2016)
Changed paths:
M ChangeLog
M libraries/config/FormDisplay.php
Log Message:
-----------
Setup script did not properly use input type password in all cases
Signed-off-by: Isaac Bennetch <benne...@gmail.com>
Commit: ef6c66dca1b0cb0a1a482477938cfc859d2baee3
https://github.com/phpmyadmin/phpmyadmin/commit/ef6c66dca1b0cb0a1a482477938cfc859d2baee3
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M libraries/central_columns.lib.php
Log Message:
-----------
Properly escape database name in central column queries
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 47f918f3fea9f3328ad3f99541caf9eaf86bb91a
https://github.com/phpmyadmin/phpmyadmin/commit/47f918f3fea9f3328ad3f99541caf9eaf86bb91a
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M url.php
Log Message:
-----------
Use standard redirect function
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 9e0a32155142731c736c792eb836e983d3c69474
https://github.com/phpmyadmin/phpmyadmin/commit/9e0a32155142731c736c792eb836e983d3c69474
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M libraries/core.lib.php
Log Message:
-----------
Canonicalize redirect URL
We provide absolute path now to avoid problems with URLs like
/phpmyadmin/index.php/.
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 8a142aba730493d654a71a02e9ee74fc1fad586c
https://github.com/phpmyadmin/phpmyadmin/commit/8a142aba730493d654a71a02e9ee74fc1fad586c
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M test/classes/plugin/auth/AuthenticationCookieTest.php
Log Message:
-----------
Adjust tests to new behavior
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 72213573182896bd6a6e5af5ba1881dd87c4a20b
https://github.com/phpmyadmin/phpmyadmin/commit/72213573182896bd6a6e5af5ba1881dd87c4a20b
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M templates/table/structure/display_table_stats.phtml
Log Message:
-----------
Fix XSS on table structure
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 03f73d48369703e0d3584699b08e24891c3295b8
https://github.com/phpmyadmin/phpmyadmin/commit/03f73d48369703e0d3584699b08e24891c3295b8
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M libraries/server_privileges.lib.php
Log Message:
-----------
Fix XSS on server privileges
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 55db1256c5d6e27c2d9fbd78e9c6f9fc11fe8571
https://github.com/phpmyadmin/phpmyadmin/commit/55db1256c5d6e27c2d9fbd78e9c6f9fc11fe8571
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M ChangeLog
M libraries/config/FormDisplay.php
Log Message:
-----------
Merge pull request #48 from phpmyadmin/security-45
Fix issue #45 input types in setup script
Commit: 73d067a540cb5ccc14209ce9f1eda69ba98555b5
https://github.com/phpmyadmin/phpmyadmin/commit/73d067a540cb5ccc14209ce9f1eda69ba98555b5
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M test/libraries/PMA_user_preferences_test.php
Log Message:
-----------
Fix test for new redirect code
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 19eef4eebb528dcce0ec922947f9ee9da3b2a2b8
https://github.com/phpmyadmin/phpmyadmin/commit/19eef4eebb528dcce0ec922947f9ee9da3b2a2b8
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M test/libraries/PMA_user_preferences_test.php
Log Message:
-----------
Merge branch 'QA_4_6' into QA_4_6-security
Commit: 5633b1d57b23ddaa5a9a976a323c90c18d9be03d
https://github.com/phpmyadmin/phpmyadmin/commit/5633b1d57b23ddaa5a9a976a323c90c18d9be03d
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M setup/frames/index.inc.php
Log Message:
-----------
Use javascript for redirection to https
The current approach is broken since whitelisting is active in url.php
and also allows potential bbcode injection.
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 4767f24ea4c1e3822ce71a636c341e8ad8d07aa6
https://github.com/phpmyadmin/phpmyadmin/commit/4767f24ea4c1e3822ce71a636c341e8ad8d07aa6
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M js/get_scripts.js.php
Log Message:
-----------
Limit number of included scripts in get_scripts.js.php
This avoids potential DOS, the limit is same as we use for generating
the URLs.
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 27caf5b46bd0890e576fea7bd7b166a0639fdf68
https://github.com/phpmyadmin/phpmyadmin/commit/27caf5b46bd0890e576fea7bd7b166a0639fdf68
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M libraries/Config.php
M libraries/core.lib.php
A test/libraries/core/PMA_cleanupPathInfo_test.php
Log Message:
-----------
Improve detection of script name
In case PHP_SELF was not set by server, we used REQUEST_URI, which might
embed PATH_INFO as well. However we really need to know the path without
it, so let's strip it as well.
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 35b2624296561a12a31a3cd88b13a8db658adeae
https://github.com/phpmyadmin/phpmyadmin/commit/35b2624296561a12a31a3cd88b13a8db658adeae
Author: Jocelyn Flament <jocelyn.flam...@gmail.com>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M po/fr.po
Log Message:
-----------
Translated using Weblate (French)
Currently translated at 100.0% (3209 of 3209 strings)
[CI skip]
Commit: 53cc34b374ffe7aefab514dc77042d89596705e7
https://github.com/phpmyadmin/phpmyadmin/commit/53cc34b374ffe7aefab514dc77042d89596705e7
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M gis_data_editor.php
Log Message:
-----------
Fix handing of GIS data
* Force geometry count to be integer
* Ensure proper escaping of GIS data
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 5b05665ff07d5af0dcd1d195711448202d0add7b
https://github.com/phpmyadmin/phpmyadmin/commit/5b05665ff07d5af0dcd1d195711448202d0add7b
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M server_status_processes.php
Log Message:
-----------
Ensure kill ID is integer
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: a1f69b4c808eeb49d336ff01e6d966200d062a56
https://github.com/phpmyadmin/phpmyadmin/commit/a1f69b4c808eeb49d336ff01e6d966200d062a56
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M gis_data_editor.php
Log Message:
-----------
Fix syntax error
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 9d6157fda758ea0605f50ac6f2bd2f8d72cf3603
https://github.com/phpmyadmin/phpmyadmin/commit/9d6157fda758ea0605f50ac6f2bd2f8d72cf3603
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M gis_data_editor.php
Log Message:
-----------
Ensure we use escaped version of type
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 69cfcc6abd90073543ecaf15d3a48d0a9a251b55
https://github.com/phpmyadmin/phpmyadmin/commit/69cfcc6abd90073543ecaf15d3a48d0a9a251b55
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M libraries/gis/GISVisualization.php
Log Message:
-----------
Ensure width and height are integers
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 1b0fde1b59a6dc7fd959971deda0c222282597e1
https://github.com/phpmyadmin/phpmyadmin/commit/1b0fde1b59a6dc7fd959971deda0c222282597e1
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M libraries/server_privileges.lib.php
Log Message:
-----------
Remove duplicated code
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 80c7b8a56104ef9a8f862135dce3db07775b227d
https://github.com/phpmyadmin/phpmyadmin/commit/80c7b8a56104ef9a8f862135dce3db07775b227d
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M libraries/Index.php
Log Message:
-----------
Add missing escaping
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: c00fe2cbfda2c3881cac764e23815dd198ad22d2
https://github.com/phpmyadmin/phpmyadmin/commit/c00fe2cbfda2c3881cac764e23815dd198ad22d2
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M ChangeLog
M libraries/rte/rte_list.lib.php
Log Message:
-----------
Fix listing routines for non privileged user
We first need to check if we can read the definition before parsing it.
Fixes #12310
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 6c5d5ffc7fac2cbf8d4d7eac5c983c84db588c3d
https://github.com/phpmyadmin/phpmyadmin/commit/6c5d5ffc7fac2cbf8d4d7eac5c983c84db588c3d
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M ChangeLog
M gis_data_editor.php
M libraries/Index.php
M libraries/gis/GISVisualization.php
M libraries/rte/rte_list.lib.php
M libraries/server_privileges.lib.php
M po/fr.po
M server_status_processes.php
Log Message:
-----------
Merge branch 'QA_4_6' into QA_4_6-security
Commit: b0180f18c828706af3a6800f0fb01a536d3ef8c7
https://github.com/phpmyadmin/phpmyadmin/commit/b0180f18c828706af3a6800f0fb01a536d3ef8c7
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M libraries/config/FormDisplay.php
Log Message:
-----------
Properly convert POST parameters
We can get array instead of single parameter, so handle this gracefully.
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: ef1493d9b4b5c89ff3ff9965068f3ebf5a3059bc
https://github.com/phpmyadmin/phpmyadmin/commit/ef1493d9b4b5c89ff3ff9965068f3ebf5a3059bc
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M libraries/Util.php
M libraries/config/FormDisplay.php
Log Message:
-----------
Move request conversion to generic code
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 96e0aa35653ec0c66084a7e9343465e16c1f769b
https://github.com/phpmyadmin/phpmyadmin/commit/96e0aa35653ec0c66084a7e9343465e16c1f769b
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M setup/validate.php
Log Message:
-----------
Fix error reporting on invalid request data
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: cd229d718e8cb4bc8ba32446beaa82d27727b6f0
https://github.com/phpmyadmin/phpmyadmin/commit/cd229d718e8cb4bc8ba32446beaa82d27727b6f0
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M libraries/config/Validator.php
Log Message:
-----------
Validate input of validator
We can not trust the input here, so we can expect anything and deal with
missing parameters or invalid values.
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 331c560fbfa0e7d2dce674b5e88e983c5f2a451d
https://github.com/phpmyadmin/phpmyadmin/commit/331c560fbfa0e7d2dce674b5e88e983c5f2a451d
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M setup/config.php
M setup/frames/index.inc.php
Log Message:
-----------
Improve error handling in setup in case config dir is not present
We do not show these options in UI, but the scripts should handle it
gracefully.
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: ee0955b30b4f0cd5f94c2bc74dd0c26b8fe49527
https://github.com/phpmyadmin/phpmyadmin/commit/ee0955b30b4f0cd5f94c2bc74dd0c26b8fe49527
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M templates/list/item.phtml
Log Message:
-----------
Use same condition for link start as for link end
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: f5e8953356465d079cbb6b6f3445aca90c98d801
https://github.com/phpmyadmin/phpmyadmin/commit/f5e8953356465d079cbb6b6f3445aca90c98d801
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M libraries/DatabaseInterface.php
M libraries/Error.php
Log Message:
-----------
Share backtrace processing for debugging and error reporting
We want to achieve same thing in both cases - backtrace which is
stripped from sensitive information, has reasonable size and can be
read. Sharing the code will make it easier to fix possible problems and
also will make both cases behave consistent.
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 1d2e2be925a5f6af70117f81892ad601e3dc161b
https://github.com/phpmyadmin/phpmyadmin/commit/1d2e2be925a5f6af70117f81892ad601e3dc161b
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M libraries/DatabaseInterface.php
M libraries/Error.php
M templates/list/item.phtml
Log Message:
-----------
Merge branch 'QA_4_6' into QA_4_6-security
Commit: 4a9da1df40952a53ca947e8fc9ecbf824768d3cf
https://github.com/phpmyadmin/phpmyadmin/commit/4a9da1df40952a53ca947e8fc9ecbf824768d3cf
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M test/classes/ErrorTest.php
Log Message:
-----------
Adjust tests to new error reporting handling of objects
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 00b9be9c4afa98d1a37f2b74c75f8c67ccf251d4
https://github.com/phpmyadmin/phpmyadmin/commit/00b9be9c4afa98d1a37f2b74c75f8c67ccf251d4
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M test/classes/ErrorTest.php
Log Message:
-----------
Merge branch 'QA_4_6' into QA_4_6-security
Commit: 009148075f8630b79eeafc60ef302607146ed20b
https://github.com/phpmyadmin/phpmyadmin/commit/009148075f8630b79eeafc60ef302607146ed20b
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M libraries/js_escape.lib.php
Log Message:
-----------
PMA_jsFormat accepts only strings
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: aef5df7e133779a2597655017f77f5c325c7e7e6
https://github.com/phpmyadmin/phpmyadmin/commit/aef5df7e133779a2597655017f77f5c325c7e7e6
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M db_central_columns.php
Log Message:
-----------
Ensure we have integer as position
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: d1ec59f05f47b1b18fd26e161bc9c60556d88cb2
https://github.com/phpmyadmin/phpmyadmin/commit/d1ec59f05f47b1b18fd26e161bc9c60556d88cb2
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M libraries/display_import.lib.php
Log Message:
-----------
Ensure we have integer as offset
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: a5950f9ecdb0445d139ae66a5119261ad2f8e5e0
https://github.com/phpmyadmin/phpmyadmin/commit/a5950f9ecdb0445d139ae66a5119261ad2f8e5e0
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M libraries/Util.php
Log Message:
-----------
Fix link to mariadb explain analyzer
- avoid double urlencoding of the query
- properly escape html entities
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 58da9751176e53b61f3992d44435e8c1d52c37f1
https://github.com/phpmyadmin/phpmyadmin/commit/58da9751176e53b61f3992d44435e8c1d52c37f1
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M libraries/Util.php
Log Message:
-----------
Add missing URL encoding
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 04a72687f84760273382509e0cf2228522653efe
https://github.com/phpmyadmin/phpmyadmin/commit/04a72687f84760273382509e0cf2228522653efe
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M libraries/navigation/NavigationTree.php
Log Message:
-----------
Add missing escaping
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 07216c9b8ede19a0d9b248e75ac0421684a93953
https://github.com/phpmyadmin/phpmyadmin/commit/07216c9b8ede19a0d9b248e75ac0421684a93953
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M libraries/Config.php
Log Message:
-----------
Ensure that connection collation contains no HTML
There is currently no MySQL collation which would do that, but just to
be safe.
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 61b4e28faf0012eaa6dea0f7fbdd43bd06357b84
https://github.com/phpmyadmin/phpmyadmin/commit/61b4e28faf0012eaa6dea0f7fbdd43bd06357b84
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M setup/lib/form_processing.lib.php
Log Message:
-----------
Sanitize page and formset before using
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 27664605b945b13e1d2b71adea822ace2099cc96
https://github.com/phpmyadmin/phpmyadmin/commit/27664605b945b13e1d2b71adea822ace2099cc96
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M examples/openid.php
Log Message:
-----------
Improve error handling in OpenID example
- properly check parameter types
- catch all exceptions (eg. network error)
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 1363ce574974ad6971f552a30b6b05f48dc80392
https://github.com/phpmyadmin/phpmyadmin/commit/1363ce574974ad6971f552a30b6b05f48dc80392
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M db_central_columns.php
M libraries/Config.php
M libraries/Util.php
M libraries/display_import.lib.php
M libraries/js_escape.lib.php
M libraries/navigation/NavigationTree.php
M setup/lib/form_processing.lib.php
Log Message:
-----------
Merge branch 'QA_4_6' into QA_4_6-security
Commit: 94cf3864254ffaf3a69e97d8fc454888368b94ab
https://github.com/phpmyadmin/phpmyadmin/commit/94cf3864254ffaf3a69e97d8fc454888368b94ab
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M examples/openid.php
Log Message:
-----------
Escape error messages from OpenID
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 418aeea3d83b0b6021bac311d849570acfc6e48c
https://github.com/phpmyadmin/phpmyadmin/commit/418aeea3d83b0b6021bac311d849570acfc6e48c
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M examples/openid.php
Log Message:
-----------
Add error handling to constructing openid message
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 0815af37f483f329f0c0565d68821fea9c47b5f5
https://github.com/phpmyadmin/phpmyadmin/commit/0815af37f483f329f0c0565d68821fea9c47b5f5
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M templates/table/structure/display_partitions.phtml
Log Message:
-----------
Add missing escaping to partition listing
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 8716855b309dbe65d7b9a5d681b80579b225b322
https://github.com/phpmyadmin/phpmyadmin/commit/8716855b309dbe65d7b9a5d681b80579b225b322
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M templates/server/databases/table_row.phtml
Log Message:
-----------
Properly escape translated string
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: d648ade18d6cbb796a93261491c121f078df2d88
https://github.com/phpmyadmin/phpmyadmin/commit/d648ade18d6cbb796a93261491c121f078df2d88
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M templates/server/binlog/log_selector.phtml
Log Message:
-----------
Escape binary log name
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: be3ecbb4cca3fbe20e3b3aa4e049902d18b60865
https://github.com/phpmyadmin/phpmyadmin/commit/be3ecbb4cca3fbe20e3b3aa4e049902d18b60865
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
M libraries/plugins/transformations/abs/DownloadTransformationsPlugin.php
M libraries/plugins/transformations/abs/ImageLinkTransformationsPlugin.php
M libraries/plugins/transformations/abs/InlineTransformationsPlugin.php
M libraries/plugins/transformations/abs/LongToIPv4TransformationsPlugin.php
M libraries/plugins/transformations/abs/PreApPendTransformationsPlugin.php
M libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php
M
libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php
M libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php
M libraries/transformations.lib.php
M test/classes/plugin/transformations/TransformationPluginsTest.php
M test/libraries/PMA_transformation_test.php
Log Message:
-----------
Simplify and cleanup transformation plugins
Remove PMA_transformation_global_html_replace which makes the code only
more confusing.
Also add escaping to browse transformations.
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 1a558a4190fe78ff283a5f5cfabcc773ef15c738
https://github.com/phpmyadmin/phpmyadmin/commit/1a558a4190fe78ff283a5f5cfabcc773ef15c738
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M setup/frames/servers.inc.php
Log Message:
-----------
Ensure id is numeric
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: e7003792d9097fca253f5e98bfe955309b2f7bc1
https://github.com/phpmyadmin/phpmyadmin/commit/e7003792d9097fca253f5e98bfe955309b2f7bc1
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2016-06-18 (Sat, 18 Jun 2016)
Changed paths:
M libraries/export.lib.php
Log Message:
-----------
Escape generated query
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: 040822fe5a7df8c7017a1bcfa1f42ae161acd3d7
https://github.com/phpmyadmin/phpmyadmin/commit/040822fe5a7df8c7017a1bcfa1f42ae161acd3d7
Author: Madhura Jayaratne <madhura...@gmail.com>
Date: 2016-06-18 (Sat, 18 Jun 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
ChangeLog entry for e7003792d90
Signed-off-by: Madhura Jayaratne <madhura...@gmail.com>
Commit: 1e5716cb96d46efc305381ae0da08e73fe340f05
https://github.com/phpmyadmin/phpmyadmin/commit/1e5716cb96d46efc305381ae0da08e73fe340f05
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M libraries/Header.php
Log Message:
-----------
Add referrer CSP and <meta> tag
This avoids leaking Referer header in modern browsers.
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 79661610f6f65443e0ec1e382a7240437f28436c
https://github.com/phpmyadmin/phpmyadmin/commit/79661610f6f65443e0ec1e382a7240437f28436c
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M js/get_image.js.php
Log Message:
-----------
Escape attributes when showing images in javascript
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 895a131d2eb7e447757a35d5731c7d647823ea8b
https://github.com/phpmyadmin/phpmyadmin/commit/895a131d2eb7e447757a35d5731c7d647823ea8b
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M js/ajax.js
Log Message:
-----------
Escape HTML when rendering AJAX error
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 364732e309cccb3fb56c938ed8d8bc0e04a3ca98
https://github.com/phpmyadmin/phpmyadmin/commit/364732e309cccb3fb56c938ed8d8bc0e04a3ca98
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M js/console.js
Log Message:
-----------
Escape error message from server
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 80cd2f448cfd18e6149a26a6819d99f47d87f158
https://github.com/phpmyadmin/phpmyadmin/commit/80cd2f448cfd18e6149a26a6819d99f47d87f158
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M ChangeLog
M libraries/export.lib.php
M setup/frames/servers.inc.php
Log Message:
-----------
Merge branch 'QA_4_6' into QA_4_6-security
Commit: 2f4950828ec241e8cbdcf13090c2582a6fa620cb
https://github.com/phpmyadmin/phpmyadmin/commit/2f4950828ec241e8cbdcf13090c2582a6fa620cb
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M libraries/Header.php
Log Message:
-----------
Update referrer <meta> to match current standards
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 4bcc606225f15bac0b07780e74f667f6ac283da7
https://github.com/phpmyadmin/phpmyadmin/commit/4bcc606225f15bac0b07780e74f667f6ac283da7
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M libraries/controllers/table/TableSearchController.php
Log Message:
-----------
Always use delimiter not present in search expression
This avoids need to figure out correct escaping in case delimiter is
present in the expression.
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 2674e503f2761cdee895b8f0e28841e67faefbc4
https://github.com/phpmyadmin/phpmyadmin/commit/2674e503f2761cdee895b8f0e28841e67faefbc4
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M libraries/Template.php
Log Message:
-----------
Assign helperFunctions before doing extract
This way we avoid possiblity of rewriting it from within the context.
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 1cc7466db3a05e95fe57a6702f41773e6829d54b
https://github.com/phpmyadmin/phpmyadmin/commit/1cc7466db3a05e95fe57a6702f41773e6829d54b
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M import.php
M libraries/Tracker.php
M libraries/plugins/export/ExportSql.php
M templates/columns_definitions/transformation.phtml
M test/libraries/core/PMA_warnMissingExtension_test.php
Log Message:
-----------
Quote delimiter before using preg_replace
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 04590894069e2c1ccaaed3b80907cf7d55785170
https://github.com/phpmyadmin/phpmyadmin/commit/04590894069e2c1ccaaed3b80907cf7d55785170
Author: uncle_cat <jd...@hotmail.com>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M po/zh_CN.po
Log Message:
-----------
Translated using Weblate (Chinese (China))
Currently translated at 88.0% (2824 of 3209 strings)
[CI skip]
Commit: 6c8c8de0971f107d676e0c66cd6cd732c17dd687
https://github.com/phpmyadmin/phpmyadmin/commit/6c8c8de0971f107d676e0c66cd6cd732c17dd687
Author: Weblate <nore...@weblate.org>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M libraries/Template.php
Log Message:
-----------
Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6
Commit: 792cd1262f012b9b13639519d414f2acaeb5e972
https://github.com/phpmyadmin/phpmyadmin/commit/792cd1262f012b9b13639519d414f2acaeb5e972
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M templates/table/structure/display_partitions.phtml
Log Message:
-----------
Escape partition comment when displaying
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 0b7416c5f4439ed3f11c023785f2d4c49a1b09fc
https://github.com/phpmyadmin/phpmyadmin/commit/0b7416c5f4439ed3f11c023785f2d4c49a1b09fc
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M libraries/server_privileges.lib.php
Log Message:
-----------
Escape user group when displaying
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: d95a4a2f96c9b080f3364defcc1cd6ecd8bdc2be
https://github.com/phpmyadmin/phpmyadmin/commit/d95a4a2f96c9b080f3364defcc1cd6ecd8bdc2be
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M libraries/SavedSearches.php
Log Message:
-----------
Avoid undefined index in case of incomplete bookmark
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 36df83a97a7f140fdb008b727a94f882847c6a6f
https://github.com/phpmyadmin/phpmyadmin/commit/36df83a97a7f140fdb008b727a94f882847c6a6f
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M libraries/DbQbe.php
Log Message:
-----------
Escape saved search name
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 960fd1fd52023047a23d069178bfff7463c2cefc
https://github.com/phpmyadmin/phpmyadmin/commit/960fd1fd52023047a23d069178bfff7463c2cefc
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M templates/table/search/rows_zoom.phtml
Log Message:
-----------
Properly escape zoom search column type
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 57ae483bad33059a885366d5445b7e1f6f29860a
https://github.com/phpmyadmin/phpmyadmin/commit/57ae483bad33059a885366d5445b7e1f6f29860a
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M js/functions.js
Log Message:
-----------
Escape database name when showing dialog
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: e50e37b51db956bcb34258491548bd7d04423711
https://github.com/phpmyadmin/phpmyadmin/commit/e50e37b51db956bcb34258491548bd7d04423711
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M libraries/server_privileges.lib.php
M test/libraries/PMA_server_privileges_test.php
Log Message:
-----------
Properly escape database name when listing privileges
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 301e1b0f7d2506b16a9e828360db21c27f051509
https://github.com/phpmyadmin/phpmyadmin/commit/301e1b0f7d2506b16a9e828360db21c27f051509
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M libraries/operations.lib.php
Log Message:
-----------
Fix adjusting privileges for tables/databases with quote in name
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 4d21b5c077db50c2a54b7f569d20f463cc2651f5
https://github.com/phpmyadmin/phpmyadmin/commit/4d21b5c077db50c2a54b7f569d20f463cc2651f5
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M js/tbl_chart.js
Log Message:
-----------
Fixed rendering of chart of columns with HTML inside
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: 519e634a8d13dd8739646c4cf566bde4c7092143
https://github.com/phpmyadmin/phpmyadmin/commit/519e634a8d13dd8739646c4cf566bde4c7092143
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M libraries/Template.php
M libraries/operations.lib.php
M libraries/server_privileges.lib.php
M po/zh_CN.po
M test/libraries/PMA_server_privileges_test.php
Log Message:
-----------
Merge branch 'QA_4_6' into QA_4_6-security
Commit: 615212a14d7d87712202f37354acf8581987fc5a
https://github.com/phpmyadmin/phpmyadmin/commit/615212a14d7d87712202f37354acf8581987fc5a
Author: Michal Čihař <mic...@cihar.com>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M
libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php
M libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php
Log Message:
-----------
Do not allow javascript: links in transformation
Signed-off-by: Michal Čihař <mic...@cihar.com>
Commit: f7d1c1f46382e7e6464fd92529d4410e635805f1
https://github.com/phpmyadmin/phpmyadmin/commit/f7d1c1f46382e7e6464fd92529d4410e635805f1
Author: Isaac Bennetch <benne...@gmail.com>
Date: 2016-06-22 (Wed, 22 Jun 2016)
Changed paths:
M ChangeLog
Log Message:
-----------
Changelog entries for security release
Signed-off-by: Isaac Bennetch <benne...@gmail.com>
Commit: 4f57305eab809a8ecfe613e38b2b5d3a4b190505
https://github.com/phpmyadmin/phpmyadmin/commit/4f57305eab809a8ecfe613e38b2b5d3a4b190505
Author: Isaac Bennetch <benne...@gmail.com>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M ChangeLog
M README
M doc/conf.py
M libraries/Config.php
Log Message:
-----------
Release 4.6.3
Signed-off-by: Isaac Bennetch <benne...@gmail.com>
Commit: f2db92434b71973a1281dfbaec8837e51e602c77
https://github.com/phpmyadmin/phpmyadmin/commit/f2db92434b71973a1281dfbaec8837e51e602c77
Author: Isaac Bennetch <benne...@gmail.com>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M examples/openid.php
M import.php
M js/ajax.js
M js/console.js
M js/functions.js
M js/get_image.js.php
M js/get_scripts.js.php
M js/tbl_chart.js
M libraries/Config.php
M libraries/DbQbe.php
M libraries/Header.php
M libraries/SavedSearches.php
M libraries/Tracker.php
M libraries/Util.php
M libraries/config/FormDisplay.php
M libraries/config/Validator.php
M libraries/controllers/table/TableSearchController.php
M libraries/core.lib.php
M libraries/operations.lib.php
M libraries/plugins/export/ExportSql.php
M libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
M libraries/plugins/transformations/abs/DownloadTransformationsPlugin.php
M libraries/plugins/transformations/abs/ImageLinkTransformationsPlugin.php
M libraries/plugins/transformations/abs/InlineTransformationsPlugin.php
M libraries/plugins/transformations/abs/LongToIPv4TransformationsPlugin.php
M libraries/plugins/transformations/abs/PreApPendTransformationsPlugin.php
M libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php
M
libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php
M libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php
M libraries/server_privileges.lib.php
M libraries/transformations.lib.php
M setup/config.php
M setup/frames/index.inc.php
M setup/validate.php
M templates/columns_definitions/transformation.phtml
M templates/server/binlog/log_selector.phtml
M templates/server/databases/table_row.phtml
M templates/table/search/rows_zoom.phtml
M templates/table/structure/display_partitions.phtml
M templates/table/structure/display_table_stats.phtml
M test/classes/plugin/transformations/TransformationPluginsTest.php
M test/libraries/PMA_transformation_test.php
A test/libraries/core/PMA_cleanupPathInfo_test.php
M test/libraries/core/PMA_warnMissingExtension_test.php
Log Message:
-----------
Fix merge conflicts
Signed-off-by: Isaac Bennetch <benne...@gmail.com>
Commit: d9841284d25e7b5e741401e9c1a1705f7803b53b
https://github.com/phpmyadmin/phpmyadmin/commit/d9841284d25e7b5e741401e9c1a1705f7803b53b
Author: Isaac Bennetch <benne...@gmail.com>
Date: 2016-06-23 (Thu, 23 Jun 2016)
Changed paths:
M ChangeLog
M README
M db_central_columns.php
M doc/conf.py
M examples/openid.php
M gis_data_editor.php
M import.php
M js/ajax.js
M js/console.js
M js/functions.js
M js/get_image.js.php
M js/get_scripts.js.php
M js/pmd/move.js
M js/server_variables.js
M js/tbl_chart.js
M libraries/Config.php
M libraries/DatabaseInterface.php
M libraries/DbQbe.php
M libraries/Error.php
M libraries/Header.php
M libraries/Index.php
M libraries/SavedSearches.php
M libraries/ServerStatusData.php
M libraries/Template.php
M libraries/Tracker.php
M libraries/Util.php
M libraries/central_columns.lib.php
M libraries/config/FormDisplay.php
M libraries/config/Validator.php
M libraries/controllers/database/DatabaseStructureController.php
M libraries/controllers/table/TableSearchController.php
M libraries/core.lib.php
M libraries/dbi/DBIMysql.php
M libraries/dbi/DBIMysqli.php
M libraries/display_import.lib.php
M libraries/export.lib.php
M libraries/gis/GISVisualization.php
M libraries/js_escape.lib.php
M libraries/navigation/NavigationTree.php
M libraries/operations.lib.php
M libraries/plugins/export/ExportJson.php
M libraries/plugins/export/ExportSql.php
M libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
M libraries/plugins/transformations/abs/DownloadTransformationsPlugin.php
M libraries/plugins/transformations/abs/ImageLinkTransformationsPlugin.php
M libraries/plugins/transformations/abs/InlineTransformationsPlugin.php
M libraries/plugins/transformations/abs/LongToIPv4TransformationsPlugin.php
M libraries/plugins/transformations/abs/PreApPendTransformationsPlugin.php
M libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php
M
libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php
M libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php
M libraries/rte/rte_list.lib.php
M libraries/server_privileges.lib.php
M libraries/transformations.lib.php
M po/ca.po
M po/de.po
M po/et.po
M po/fr.po
M po/hu.po
M po/pa.po
M po/pt_BR.po
M po/zh_CN.po
M server_status_processes.php
M setup/config.php
M setup/frames/index.inc.php
M setup/frames/servers.inc.php
M setup/lib/form_processing.lib.php
M setup/validate.php
M templates/columns_definitions/transformation.phtml
M templates/list/item.phtml
M templates/server/binlog/log_selector.phtml
M templates/server/databases/table_row.phtml
M templates/server/variables/variable_row.phtml
M templates/table/search/rows_zoom.phtml
M templates/table/structure/display_partitions.phtml
M templates/table/structure/display_table_stats.phtml
M test/classes/ConfigTest.php
M test/classes/ErrorTest.php
M test/classes/controllers/DatabaseStructureControllerTest.php
M test/classes/plugin/auth/AuthenticationCookieTest.php
M test/classes/plugin/export/ExportJsonTest.php
M test/classes/plugin/transformations/TransformationPluginsTest.php
M test/libraries/PMA_server_privileges_test.php
M test/libraries/PMA_transformation_test.php
M test/libraries/PMA_user_preferences_test.php
M test/libraries/common/PMA_formatNumberByteDown_test.php
A test/libraries/core/PMA_cleanupPathInfo_test.php
M test/libraries/core/PMA_warnMissingExtension_test.php
M url.php
Log Message:
-----------
Merge branch 'QA_4_6' into STABLE
Compare:
https://github.com/phpmyadmin/phpmyadmin/compare/16f1f72fadc9...d9841284d25e_______________________________________________
Git mailing list
Git@phpmyadmin.net
https://lists.phpmyadmin.net/mailman/listinfo/git
