[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 2bf398: Use sprintf instead of directly concatenating the ...

Isaac Bennetch bennetch at gmail.com
Mon Jan 23 23:54:04 CET 2017


  Branch: refs/heads/QA_4_6
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 2bf398a3a8d0627b88398384af246367cc1e00ba
      https://github.com/phpmyadmin/phpmyadmin/commit/2bf398a3a8d0627b88398384af246367cc1e00ba
  Author: Deven Bansod <devenbansod.bits at gmail.com>
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
    M templates/navigation/logo.phtml

  Log Message:
  -----------
  Use sprintf instead of directly concatenating the variable

Signed-off-by: Deven Bansod <devenbansod.bits at gmail.com>


  Commit: 7bf85fe817114460de0ad51cf436d1921aef2924
      https://github.com/phpmyadmin/phpmyadmin/commit/7bf85fe817114460de0ad51cf436d1921aef2924
  Author: Deven Bansod <devenbansod.bits at gmail.com>
  Date:   2016-10-10 (Mon, 10 Oct 2016)

  Changed paths:
    M libraries/navigation/NavigationTree.php
    M libraries/navigation/nodes/Node.php

  Log Message:
  -----------
  Use sprintf instead of directly concatenating the variable

Signed-off-by: Deven Bansod <devenbansod.bits at gmail.com>


  Commit: 62517b08e248401d8ac57bcec0a0809374c9cf26
      https://github.com/phpmyadmin/phpmyadmin/commit/62517b08e248401d8ac57bcec0a0809374c9cf26
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M libraries/navigation/NavigationTree.php
    M libraries/navigation/nodes/Node.php

  Log Message:
  -----------
  Merge remote-tracking branch 'security/pull/218' into QA_4_6-security


  Commit: 3c9d440990b9d6462b9d5eea739c3b5fc18c5967
      https://github.com/phpmyadmin/phpmyadmin/commit/3c9d440990b9d6462b9d5eea739c3b5fc18c5967
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M templates/navigation/logo.phtml

  Log Message:
  -----------
  Merge remote-tracking branch 'security/pull/217' into QA_4_6-security


  Commit: 96b4f13e54c9ebbebfd19d0690bfa0812b6818c1
      https://github.com/phpmyadmin/phpmyadmin/commit/96b4f13e54c9ebbebfd19d0690bfa0812b6818c1
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M libraries/controllers/database/DatabaseStructureController.php

  Log Message:
  -----------
  Quote table name for use in regexp

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 4c84070ad6136c3158caa93286754ebbfbce61ab
      https://github.com/phpmyadmin/phpmyadmin/commit/4c84070ad6136c3158caa93286754ebbfbce61ab
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M setup/frames/index.inc.php

  Log Message:
  -----------
  Avoid using REQUEST_URI in form action

It's really not necessary here and might cause redirection issues.

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 9d712359d00afa828d5dd70325b213071d411f83
      https://github.com/phpmyadmin/phpmyadmin/commit/9d712359d00afa828d5dd70325b213071d411f83
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M libraries/navigation/NavigationTree.php

  Log Message:
  -----------
  Fix typo

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: e37bf40f44a3272a6709eb5b38feccac41658e3f
      https://github.com/phpmyadmin/phpmyadmin/commit/e37bf40f44a3272a6709eb5b38feccac41658e3f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M libraries/config/PageSettings.php

  Log Message:
  -----------
  Avoid using REQUEST_URI for redirection

* Stick with PMA_sendHeaderLocation to handle server weirdness
* Use already calculated URL

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: ec6c55c1df67b6a6e809087b095f36cfcf703d9f
      https://github.com/phpmyadmin/phpmyadmin/commit/ec6c55c1df67b6a6e809087b095f36cfcf703d9f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M libraries/config/PageSettings.php

  Log Message:
  -----------
  Add missing ;

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: a134a0117765644cd6d9311b5e3d963a20e6ed15
      https://github.com/phpmyadmin/phpmyadmin/commit/a134a0117765644cd6d9311b5e3d963a20e6ed15
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M tbl_replace.php

  Log Message:
  -----------
  Avoid infinite recursion on goto

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 3a6247674e653507294f23480b4c0e1c532badbe
      https://github.com/phpmyadmin/phpmyadmin/commit/3a6247674e653507294f23480b4c0e1c532badbe
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M libraries/Theme.php

  Log Message:
  -----------
  Do not provide fallback to cookie for font size

* This should be already handled by Config class
* Injecting cookie value to CSS could be security risk

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: fe394c90a877216cb34e58997b557dca79fd94ab
      https://github.com/phpmyadmin/phpmyadmin/commit/fe394c90a877216cb34e58997b557dca79fd94ab
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M scripts/create-release.sh
    M scripts/generate-mo
    M scripts/generate-sprites
    M scripts/lang-cleanup.sh
    M scripts/line-counts.sh
    M scripts/locales-contributors
    M scripts/remove-incomplete-mo
    M scripts/transformations_generator_main_class.sh
    M scripts/transformations_generator_plugin.sh
    M scripts/update-po
    M scripts/upload-release
    M test/install-browserstack
    M test/install-runkit
    M test/start-local-server

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


  Commit: 3b6ed1f9ecaab86c488d106b1588d7683a6d53ef
      https://github.com/phpmyadmin/phpmyadmin/commit/3b6ed1f9ecaab86c488d106b1588d7683a6d53ef
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M libraries/core.lib.php
    M test/libraries/core/PMA_cleanupPathInfo_test.php

  Log Message:
  -----------
  Improve PHP path cleanup

- properly handle situation when query string contains PATH_INFO
- cleanup path from any relative parts

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 053e73d0c3a2280f2138b6f1405bce41851da03a
      https://github.com/phpmyadmin/phpmyadmin/commit/053e73d0c3a2280f2138b6f1405bce41851da03a
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M libraries/core.lib.php

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


  Commit: 7b5c2699f6fe459de1a86ccc873227f7632670f7
      https://github.com/phpmyadmin/phpmyadmin/commit/7b5c2699f6fe459de1a86ccc873227f7632670f7
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-08 (Thu, 08 Dec 2016)

  Changed paths:
    M libraries/core.lib.php

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


  Commit: be8eb4bf3e080d90583d68ef685949b7d093e450
      https://github.com/phpmyadmin/phpmyadmin/commit/be8eb4bf3e080d90583d68ef685949b7d093e450
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-13 (Tue, 13 Dec 2016)

  Changed paths:
    M .travis.yml
    M ChangeLog
    M doc/config.rst
    M doc/credits.rst
    M doc/faq.rst
    M doc/glossary.rst
    M libraries/SysInfoLinux.php
    M libraries/phpseclib/Crypt/Base.php
    M libraries/phpseclib/Crypt/Random.php
    M libraries/plugins/schema/svg/Svg.php
    M libraries/plugins/schema/svg/SvgRelationSchema.php
    M po/cs.po
    M po/es.po
    M setup/frames/index.inc.php
    M setup/lib/index.lib.php
    M setup/scripts.js
    M test/install-runkit
    M test/libraries/PMA_server_status_monitor_test.php
    M test/libraries/PMA_server_status_queries_test.php
    M test/libraries/PMA_server_status_test.php

  Log Message:
  -----------
  Merge commit '90e4325bcf' into QA_4_6-security


  Commit: 665a5fcbe2e75c22a65c942a2ad8365b8599d1b3
      https://github.com/phpmyadmin/phpmyadmin/commit/665a5fcbe2e75c22a65c942a2ad8365b8599d1b3
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-13 (Tue, 13 Dec 2016)

  Changed paths:
    M libraries/Util.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    M po/bg.po
    M po/bn.po
    M po/br.po
    M po/brx.po
    M po/bs.po
    M po/ca.po
    M po/ckb.po
    M po/cs.po
    M po/cy.po
    M po/da.po
    M po/de.po
    M po/el.po
    M po/en_GB.po
    M po/eo.po
    M po/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.po
    M po/fy.po
    M po/gl.po
    M po/gu.po
    M po/he.po
    M po/hi.po
    M po/hr.po
    M po/hu.po
    M po/hy.po
    M po/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/km.po
    M po/kn.po
    M po/ko.po
    M po/ksh.po
    M po/ky.po
    M po/li.po
    M po/lt.po
    M po/lv.po
    M po/mk.po
    M po/ml.po
    M po/mn.po
    M po/ms.po
    M po/nb.po
    M po/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    M po/pl.po
    M po/pt.po
    M po/pt_BR.po
    M po/ro.po
    M po/ru.po
    M po/si.po
    M po/sk.po
    M po/sl.po
    M po/sq.po
    M po/sr.po
    M po/sr at latin.po
    M po/sv.po
    M po/ta.po
    M po/te.po
    M po/th.po
    M po/tk.po
    M po/tr.po
    M po/tt.po
    M po/ug.po
    M po/uk.po
    M po/ur.po
    M po/uz.po
    M po/uz at latin.po
    M po/vi.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po
    M test/libraries/PMA_SetupIndex_test.php

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


  Commit: e922991f334036cb3eb7ba7ade699025b7e088f3
      https://github.com/phpmyadmin/phpmyadmin/commit/e922991f334036cb3eb7ba7ade699025b7e088f3
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-13 (Tue, 13 Dec 2016)

  Changed paths:
    M libraries/Util.php

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


  Commit: e1d9e31dff329acc05e94fe03f0b8a21c4d5b437
      https://github.com/phpmyadmin/phpmyadmin/commit/e1d9e31dff329acc05e94fe03f0b8a21c4d5b437
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-21 (Wed, 21 Dec 2016)

  Changed paths:
    M ChangeLog
    M doc/config.rst
    M doc/faq.rst
    M js/rte.js
    M js/tbl_structure.js
    M libraries/Config.php
    M libraries/DatabaseInterface.php
    M libraries/Footer.php
    M libraries/Header.php
    M libraries/Util.php
    M libraries/config.default.php
    M libraries/controllers/table/TableStructureController.php
    M libraries/core.lib.php
    M libraries/plugins/auth/AuthenticationCookie.php
    M libraries/plugins/auth/AuthenticationHttp.php
    M libraries/pmd_common.php
    M libraries/rte/rte_routines.lib.php
    M phpunit.xml.dist
    M po/ca.po
    M po/cs.po
    M po/de.po
    M po/el.po
    M po/es.po
    M po/fr.po
    M po/ia.po
    M po/it.po
    M po/nl.po
    M po/sl.po
    M po/tr.po
    M scripts/lang-cleanup.sh
    M templates/database/designer/database_tables.phtml
    M templates/database/designer/table_list.phtml
    R test/.htaccess
    M test/classes/plugin/auth/AuthenticationCookieTest.php
    M test/classes/plugin/auth/AuthenticationHttpTest.php

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


  Commit: 695a488c4294ebdb972607d8296746310ddb5b7b
      https://github.com/phpmyadmin/phpmyadmin/commit/695a488c4294ebdb972607d8296746310ddb5b7b
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-21 (Wed, 21 Dec 2016)

  Changed paths:
    M libraries/replication_gui.lib.php

  Log Message:
  -----------
  Do not allow arbitrary connection in replication setup without AllowArbitraryServer

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: c962ee4287b50af754b8fe72c0c4ef6cebf3c489
      https://github.com/phpmyadmin/phpmyadmin/commit/c962ee4287b50af754b8fe72c0c4ef6cebf3c489
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-21 (Wed, 21 Dec 2016)

  Changed paths:
    M doc/setup.rst
    M libraries/config/ConfigFile.php
    M libraries/vendor_config.php
    M setup/config.php
    M setup/frames/config.inc.php
    M setup/frames/index.inc.php
    M setup/lib/index.lib.php
    M test/classes/config/ConfigFileTest.php
    M test/libraries/PMA_SetupIndex_test.php

  Log Message:
  -----------
  Remove setup download/load/delete features

This removes risk of third party manipulating with the configuration as
there was race condition between editing and using the file.

Downloading the file should not be big hassle and this really makes the
whole setup a bit simpler.

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: f792f294f219290f3a9360788940d0e491f5d009
      https://github.com/phpmyadmin/phpmyadmin/commit/f792f294f219290f3a9360788940d0e491f5d009
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-12-21 (Wed, 21 Dec 2016)

  Changed paths:
    M setup/index.php

  Log Message:
  -----------
  Disable setup if configuration already exists

The setup allows to figure out quite a lot about system and network, so
it's safer to block access to it once phpMyAdmin has been configured.

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: cbcf740adbad341c05705de6506908f41a24fbcf
      https://github.com/phpmyadmin/phpmyadmin/commit/cbcf740adbad341c05705de6506908f41a24fbcf
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-01-07 (Sat, 07 Jan 2017)

  Changed paths:
    M ChangeLog
    M js/functions.js
    M libraries/Index.php
    M libraries/Table.php
    M libraries/dbi/DBIMysqli.php
    M libraries/replication_gui.lib.php
    M libraries/server_privileges.lib.php
    M libraries/sql-parser/src/Component.php
    M libraries/sql-parser/src/Components/AlterOperation.php
    M libraries/sql-parser/src/Components/Array2d.php
    M libraries/sql-parser/src/Components/ArrayObj.php
    M libraries/sql-parser/src/Components/CaseExpression.php
    M libraries/sql-parser/src/Components/Condition.php
    M libraries/sql-parser/src/Components/CreateDefinition.php
    M libraries/sql-parser/src/Components/DataType.php
    M libraries/sql-parser/src/Components/Expression.php
    M libraries/sql-parser/src/Components/ExpressionArray.php
    M libraries/sql-parser/src/Components/FunctionCall.php
    M libraries/sql-parser/src/Components/IntoKeyword.php
    M libraries/sql-parser/src/Components/JoinKeyword.php
    M libraries/sql-parser/src/Components/Key.php
    M libraries/sql-parser/src/Components/Limit.php
    M libraries/sql-parser/src/Components/OptionsArray.php
    M libraries/sql-parser/src/Components/OrderKeyword.php
    M libraries/sql-parser/src/Components/ParameterDefinition.php
    M libraries/sql-parser/src/Components/PartitionDefinition.php
    M libraries/sql-parser/src/Components/Reference.php
    M libraries/sql-parser/src/Components/RenameOperation.php
    M libraries/sql-parser/src/Components/SetOperation.php
    M libraries/sql-parser/src/Components/UnionKeyword.php
    M libraries/sql-parser/src/Context.php
    M libraries/sql-parser/src/Contexts/ContextMySql50000.php
    M libraries/sql-parser/src/Contexts/ContextMySql50100.php
    M libraries/sql-parser/src/Contexts/ContextMySql50500.php
    M libraries/sql-parser/src/Contexts/ContextMySql50600.php
    M libraries/sql-parser/src/Contexts/ContextMySql50700.php
    M libraries/sql-parser/src/Exceptions/LexerException.php
    M libraries/sql-parser/src/Exceptions/ParserException.php
    M libraries/sql-parser/src/Lexer.php
    M libraries/sql-parser/src/Parser.php
    M libraries/sql-parser/src/Statement.php
    M libraries/sql-parser/src/Statements/AlterStatement.php
    M libraries/sql-parser/src/Statements/AnalyzeStatement.php
    M libraries/sql-parser/src/Statements/BackupStatement.php
    M libraries/sql-parser/src/Statements/CallStatement.php
    M libraries/sql-parser/src/Statements/CheckStatement.php
    M libraries/sql-parser/src/Statements/ChecksumStatement.php
    M libraries/sql-parser/src/Statements/CreateStatement.php
    M libraries/sql-parser/src/Statements/DeleteStatement.php
    M libraries/sql-parser/src/Statements/DropStatement.php
    M libraries/sql-parser/src/Statements/ExplainStatement.php
    M libraries/sql-parser/src/Statements/InsertStatement.php
    M libraries/sql-parser/src/Statements/MaintenanceStatement.php
    M libraries/sql-parser/src/Statements/NotImplementedStatement.php
    M libraries/sql-parser/src/Statements/OptimizeStatement.php
    M libraries/sql-parser/src/Statements/RenameStatement.php
    M libraries/sql-parser/src/Statements/RepairStatement.php
    M libraries/sql-parser/src/Statements/ReplaceStatement.php
    M libraries/sql-parser/src/Statements/RestoreStatement.php
    M libraries/sql-parser/src/Statements/SelectStatement.php
    M libraries/sql-parser/src/Statements/SetStatement.php
    M libraries/sql-parser/src/Statements/ShowStatement.php
    M libraries/sql-parser/src/Statements/TransactionStatement.php
    M libraries/sql-parser/src/Statements/TruncateStatement.php
    M libraries/sql-parser/src/Statements/UpdateStatement.php
    M libraries/sql-parser/src/Token.php
    M libraries/sql-parser/src/TokensList.php
    M libraries/sql-parser/src/UtfString.php
    M libraries/sql-parser/src/Utils/BufferedQuery.php
    M libraries/sql-parser/src/Utils/CLI.php
    M libraries/sql-parser/src/Utils/Error.php
    M libraries/sql-parser/src/Utils/Formatter.php
    M libraries/sql-parser/src/Utils/Misc.php
    M libraries/sql-parser/src/Utils/Query.php
    M libraries/sql-parser/src/Utils/Routine.php
    M libraries/sql-parser/src/Utils/Table.php
    M libraries/sql-parser/src/Utils/Tokens.php
    M libraries/sql-parser/src/common.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    M po/bg.po
    M po/bn.po
    M po/br.po
    M po/brx.po
    M po/bs.po
    M po/ca.po
    M po/ckb.po
    M po/cs.po
    M po/cy.po
    M po/da.po
    M po/de.po
    M po/el.po
    M po/en_GB.po
    M po/eo.po
    M po/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.po
    M po/fy.po
    M po/gl.po
    M po/gu.po
    M po/he.po
    M po/hi.po
    M po/hr.po
    M po/hu.po
    M po/hy.po
    M po/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/km.po
    M po/kn.po
    M po/ko.po
    M po/ksh.po
    M po/ky.po
    M po/li.po
    M po/lt.po
    M po/lv.po
    M po/mk.po
    M po/ml.po
    M po/mn.po
    M po/ms.po
    M po/nb.po
    M po/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    M po/pl.po
    M po/pt.po
    M po/pt_BR.po
    M po/ro.po
    M po/ru.po
    M po/si.po
    M po/sk.po
    M po/sl.po
    M po/sq.po
    M po/sr.po
    M po/sr at latin.po
    M po/sv.po
    M po/ta.po
    M po/te.po
    M po/th.po
    M po/tk.po
    M po/tr.po
    M po/tt.po
    M po/ug.po
    M po/uk.po
    M po/ur.po
    M po/uz.po
    M po/uz at latin.po
    M po/vi.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po
    M test/libraries/PMA_server_replication_test.php

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


  Commit: 4ab34edba6a14dfdad988310a88e1b3770c6ab64
      https://github.com/phpmyadmin/phpmyadmin/commit/4ab34edba6a14dfdad988310a88e1b3770c6ab64
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M libraries/php-gettext/gettext.php

  Log Message:
  -----------
  Merge changes from php-gettext 1.0.12

This ensures that parameter to select_string is numeric, avoiding code
injection through it.

Our code is not vulnerable as we do not pass user supplied values to
this function, this fix is included only to be closer to upstream.

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: a5d677115e9ba308bdbe23cda31c4ca59d45cc35
      https://github.com/phpmyadmin/phpmyadmin/commit/a5d677115e9ba308bdbe23cda31c4ca59d45cc35
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-01-17 (Tue, 17 Jan 2017)

  Changed paths:
    M po/ko.po
    M po/pt.po
    M po/pt_BR.po

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


  Commit: 1e2c24474e94b76a020c52bd107e8aae00336a0b
      https://github.com/phpmyadmin/phpmyadmin/commit/1e2c24474e94b76a020c52bd107e8aae00336a0b
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-01-21 (Sat, 21 Jan 2017)

  Changed paths:
    M ChangeLog
    M doc/config.rst
    M index.php
    M libraries/DbSearch.php
    M libraries/Table.php
    M libraries/common.inc.php
    M libraries/config.default.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/insert_edit.lib.php
    M libraries/navigation/NavigationTree.php
    M libraries/operations.lib.php
    M libraries/server_status_processes.lib.php
    M libraries/sql-parser/src/Lexer.php
    M libraries/sql-parser/src/Utils/Formatter.php
    A phpinfo.php
    M po/az.po
    M po/ia.po
    M po/pt.po
    M tbl_operations.php
    M test/classes/TableTest.php

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


  Commit: 3adb0eb8889ca8d88c72e74b3a20f67db45d749f
      https://github.com/phpmyadmin/phpmyadmin/commit/3adb0eb8889ca8d88c72e74b3a20f67db45d749f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-01-21 (Sat, 21 Jan 2017)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Add changelog entries for security fixes

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 1db25d644758ae5841db9e8ae06f8c8b799ec48f
      https://github.com/phpmyadmin/phpmyadmin/commit/1db25d644758ae5841db9e8ae06f8c8b799ec48f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    M po/bg.po
    M po/bn.po
    M po/br.po
    M po/brx.po
    M po/bs.po
    M po/ca.po
    M po/ckb.po
    M po/cs.po
    M po/cy.po
    M po/da.po
    M po/de.po
    M po/el.po
    M po/en_GB.po
    M po/eo.po
    M po/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.po
    M po/fy.po
    M po/gl.po
    M po/gu.po
    M po/he.po
    M po/hi.po
    M po/hr.po
    M po/hu.po
    M po/hy.po
    M po/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/km.po
    M po/kn.po
    M po/ko.po
    M po/ksh.po
    M po/ky.po
    M po/li.po
    M po/lt.po
    M po/lv.po
    M po/mk.po
    M po/ml.po
    M po/mn.po
    M po/ms.po
    M po/nb.po
    M po/ne.po
    M po/nl.po
    M po/pa.po
    M po/phpmyadmin.pot
    M po/pl.po
    M po/pt.po
    M po/pt_BR.po
    M po/ro.po
    M po/ru.po
    M po/si.po
    M po/sk.po
    M po/sl.po
    M po/sq.po
    M po/sr.po
    M po/sr at latin.po
    M po/sv.po
    M po/ta.po
    M po/te.po
    M po/th.po
    M po/tk.po
    M po/tr.po
    M po/tt.po
    M po/ug.po
    M po/uk.po
    M po/ur.po
    M po/uz.po
    M po/uz at latin.po
    M po/vi.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po

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


  Commit: 3087a889567ecf547ac98f6c7668c67a1153f3af
      https://github.com/phpmyadmin/phpmyadmin/commit/3087a889567ecf547ac98f6c7668c67a1153f3af
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M ChangeLog
    M doc/setup.rst
    M libraries/Theme.php
    M libraries/config/ConfigFile.php
    M libraries/config/PageSettings.php
    M libraries/controllers/database/DatabaseStructureController.php
    M libraries/core.lib.php
    M libraries/navigation/NavigationTree.php
    M libraries/navigation/nodes/Node.php
    M libraries/php-gettext/gettext.php
    M libraries/replication_gui.lib.php
    M libraries/vendor_config.php
    M setup/config.php
    M setup/frames/config.inc.php
    M setup/frames/index.inc.php
    M setup/index.php
    M setup/lib/index.lib.php
    M tbl_replace.php
    M templates/navigation/logo.phtml
    M test/classes/config/ConfigFileTest.php
    M test/libraries/PMA_SetupIndex_test.php
    M test/libraries/core/PMA_cleanupPathInfo_test.php

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


  Commit: c812bcd4112c3d44e6e6bc72e710b9935c6aa9d3
      https://github.com/phpmyadmin/phpmyadmin/commit/c812bcd4112c3d44e6e6bc72e710b9935c6aa9d3
  Author: Isaac Bennetch <bennetch at gmail.com>
  Date:   2017-01-23 (Mon, 23 Jan 2017)

  Changed paths:
    M ChangeLog
    M README
    M doc/conf.py
    M libraries/Config.php

  Log Message:
  -----------
  Prepare for 4.6.6 release

Signed-off-by: Isaac Bennetch <bennetch at gmail.com>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/18f18af84822...c812bcd4112c


More information about the Git mailing list