[phpMyAdmin Git] [phpmyadmin/phpmyadmin] dffc8c: Remove logic code in declaration files.

Sun Nov 29 13:29:52 CET 2015

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: dffc8c34e92bf1a8a1ae750e415629027a5a3f39
      https://github.com/phpmyadmin/phpmyadmin/commit/dffc8c34e92bf1a8a1ae750e415629027a5a3f39
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M PMAStandard/ruleset.xml
    M libraries/DbQbe.php
    M libraries/advisor.lib.php
    M libraries/bookmark.lib.php
    M libraries/browse_foreigners.lib.php
    M libraries/build_html_for_db.lib.php
    M libraries/central_columns.lib.php
    M libraries/cleanup.lib.php
    M libraries/create_addfield.lib.php
    M libraries/display_change_password.lib.php
    M libraries/display_export.lib.php
    M libraries/display_git_revision.lib.php
    M libraries/display_import.lib.php
    M libraries/display_select_lang.lib.php
    M libraries/export.lib.php
    M libraries/file_listing.lib.php
    M libraries/index.lib.php
    M libraries/insert_edit.lib.php
    M libraries/ip_allow_deny.lib.php
    M libraries/js_escape.lib.php
    M libraries/logging.lib.php
    M libraries/mime.lib.php
    M libraries/mult_submits.lib.php
    M libraries/mysql_charsets.lib.php
    M libraries/normalization.lib.php
    M libraries/operations.lib.php
    M libraries/relation.lib.php
    M libraries/relation_cleanup.lib.php
    M libraries/replication_gui.lib.php
    M libraries/sanitizing.lib.php
    M libraries/select_lang.lib.php
    M libraries/select_server.lib.php
    M libraries/server_bin_log.lib.php
    M libraries/server_collations.lib.php
    M libraries/server_common.lib.php
    M libraries/server_databases.lib.php
    M libraries/server_engines.lib.php
    M libraries/server_plugins.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_status.lib.php
    M libraries/server_status_advisor.lib.php
    M libraries/server_status_monitor.lib.php
    M libraries/server_status_processes.lib.php
    M libraries/server_status_queries.lib.php
    M libraries/server_status_variables.lib.php
    M libraries/server_user_groups.lib.php
    M libraries/server_users.lib.php
    M libraries/server_variables.lib.php
    M libraries/session.inc.php
    A libraries/session.lib.php
    M libraries/sql.lib.php

  Log Message:
  -----------
  Remove logic code in declaration files.
Move declaration out of logic file.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 50a574c3c5754cdf6a5dcf58eb2ed945bd0be457
      https://github.com/phpmyadmin/phpmyadmin/commit/50a574c3c5754cdf6a5dcf58eb2ed945bd0be457
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M libraries/autoloader.php

  Log Message:
  -----------
  Update PHPDoc.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: d2d0fc1263066dd39656059c9e9acf3e11d5d778
      https://github.com/phpmyadmin/phpmyadmin/commit/d2d0fc1263066dd39656059c9e9acf3e11d5d778
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M libraries/operations.lib.php
    M libraries/server_collations.lib.php
    M libraries/server_databases.lib.php
    M libraries/server_engines.lib.php
    M libraries/server_plugins.lib.php
    M libraries/server_status.lib.php
    M libraries/server_status_advisor.lib.php
    M libraries/server_status_monitor.lib.php
    M libraries/server_status_processes.lib.php
    M libraries/server_status_queries.lib.php
    M libraries/server_status_variables.lib.php
    M libraries/server_variables.lib.php

  Log Message:
  -----------
  Remove useless empty lines at beginning of files.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 154a942145138be3bd16cec82eb6559b56dbf450
      https://github.com/phpmyadmin/phpmyadmin/commit/154a942145138be3bd16cec82eb6559b56dbf450
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2015-10-27 (Tue, 27 Oct 2015)

  Changed paths:
    M libraries/engines/Bdb.php
    M libraries/engines/Berkeleydb.php
    M libraries/engines/Binlog.php
    M libraries/engines/Innobase.php
    M libraries/engines/Innodb.php
    M libraries/engines/Memory.php
    M libraries/engines/Merge.php
    M libraries/engines/Mrg_Myisam.php
    M libraries/engines/Myisam.php
    M libraries/engines/Ndbcluster.php
    M libraries/engines/Pbxt.php
    M libraries/engines/Performance_Schema.php
    M libraries/plugins/auth/swekey/swekey.auth.lib.php
    M libraries/plugins/import/ImportCsv.php
    M libraries/plugins/import/ImportMediawiki.php
    M libraries/plugins/import/ImportOds.php
    M libraries/plugins/import/ImportShp.php
    M libraries/plugins/import/ImportSql.php
    M libraries/plugins/import/ImportXml.php
    M libraries/plugins/import/ShapeFile.php
    M libraries/plugins/import/ShapeRecord.php
    M libraries/plugins/schema/ExportRelationSchema.php
    M libraries/plugins/schema/RelationStats.php
    M libraries/plugins/schema/SchemaDia.php
    M libraries/plugins/schema/SchemaEps.php
    M libraries/plugins/schema/SchemaPdf.php
    M libraries/plugins/schema/SchemaSvg.php
    M libraries/plugins/schema/TableStats.php
    M libraries/plugins/schema/dia/DiaRelationSchema.php
    M libraries/plugins/schema/dia/RelationStatsDia.php
    M libraries/plugins/schema/dia/TableStatsDia.php
    M libraries/plugins/schema/eps/EpsRelationSchema.php
    M libraries/plugins/schema/eps/RelationStatsEps.php
    M libraries/plugins/schema/eps/TableStatsEps.php
    M libraries/plugins/schema/pdf/Pdf.php
    M libraries/plugins/schema/pdf/PdfRelationSchema.php
    M libraries/plugins/schema/pdf/RelationStatsPdf.php
    M libraries/plugins/schema/pdf/TableStatsPdf.php
    M libraries/plugins/schema/svg/RelationStatsSvg.php
    M libraries/plugins/schema/svg/Svg.php
    M libraries/plugins/schema/svg/TableStatsSvg.php
    M libraries/plugins/transformations/Text_Plain_Link.php
    M libraries/plugins/transformations/Text_Plain_Longtoipv4.php
    M libraries/plugins/transformations/Text_Plain_PreApPend.php
    M libraries/plugins/transformations/Text_Plain_Substring.php
    M libraries/plugins/transformations/abs/Bool2TextTransformationsPlugin.php
    M libraries/plugins/transformations/abs/CodeMirrorEditorTransformationPlugin.php
    M libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
    M libraries/plugins/transformations/abs/DownloadTransformationsPlugin.php
    M libraries/plugins/transformations/abs/ExternalTransformationsPlugin.php
    M libraries/plugins/transformations/abs/FormattedTransformationsPlugin.php
    M libraries/plugins/transformations/abs/HexTransformationsPlugin.php
    M libraries/plugins/transformations/abs/ImageUploadTransformationsPlugin.php
    M libraries/plugins/transformations/abs/LongToIPv4TransformationsPlugin.php
    M libraries/plugins/transformations/abs/PreApPendTransformationsPlugin.php
    M libraries/plugins/transformations/abs/RegexValidationTransformationsPlugin.php
    M libraries/plugins/transformations/abs/SQLTransformationsPlugin.php
    M libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php
    M libraries/plugins/transformations/abs/TextFileUploadTransformationsPlugin.php
    M libraries/plugins/transformations/input/Image_JPEG_Upload.php
    M libraries/plugins/transformations/input/Text_Plain_FileUpload.php
    M libraries/plugins/transformations/input/Text_Plain_Iptobinary.php
    M libraries/plugins/transformations/input/Text_Plain_JsonEditor.php
    M libraries/plugins/transformations/input/Text_Plain_RegexValidation.php
    M libraries/plugins/transformations/input/Text_Plain_SqlEditor.php
    M libraries/plugins/transformations/input/Text_Plain_XmlEditor.php
    M libraries/plugins/transformations/output/Application_Octetstream_Download.php
    M libraries/plugins/transformations/output/Application_Octetstream_Hex.php
    M libraries/plugins/transformations/output/Image_JPEG_Inline.php
    M libraries/plugins/transformations/output/Image_JPEG_Link.php
    M libraries/plugins/transformations/output/Image_PNG_Inline.php
    M libraries/plugins/transformations/output/Text_Octetstream_Sql.php
    M libraries/plugins/transformations/output/Text_Plain_Binarytoip.php
    M libraries/plugins/transformations/output/Text_Plain_Bool2Text.php
    M libraries/plugins/transformations/output/Text_Plain_Dateformat.php
    M libraries/plugins/transformations/output/Text_Plain_External.php
    M libraries/plugins/transformations/output/Text_Plain_Formatted.php
    M libraries/plugins/transformations/output/Text_Plain_Imagelink.php
    M libraries/plugins/transformations/output/Text_Plain_Json.php
    M libraries/plugins/transformations/output/Text_Plain_Sql.php
    M libraries/plugins/transformations/output/Text_Plain_Xml.php

  Log Message:
  -----------
  Remove side effects in declaration files.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 08cdf6f2fdc2d42460b2a36a0af41ffa28825146
      https://github.com/phpmyadmin/phpmyadmin/commit/08cdf6f2fdc2d42460b2a36a0af41ffa28825146
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M ChangeLog
    M README.rst
    M db_create.php
    M db_designer.php
    M db_operations.php
    M db_qbe.php
    M db_structure.php
    M db_tracking.php
    M export.php
    M gis_data_editor.php
    M import.php
    M index.php
    M js/OpenStreetMap.js
    M js/ajax.js
    M js/functions.js
    M js/gis_data_editor.js
    M js/messages.php
    M js/navigation.js
    M js/pmd/designer_objects.js
    M js/pmd/iecanvas.js
    M js/server_status_monitor.js
    M js/server_status_processes.js
    M js/server_status_queries.js
    M js/sql.js
    M js/tbl_gis_visualization.js
    M js/tbl_operations.js
    M libraries/Config.php
    M libraries/DatabaseInterface.php
    M libraries/DisplayResults.php
    M libraries/OutputBuffering.php
    M libraries/Psr4Autoloader.php
    M libraries/Scripts.php
    M libraries/Table.php
    M libraries/Util.php
    M libraries/VersionInformation.php
    M libraries/check_user_privileges.lib.php
    M libraries/common.inc.php
    M libraries/config.default.php
    M libraries/controllers/DatabaseStructureController.php
    R libraries/controllers/TableStructureController.php
    M libraries/controllers/table/TableGisVisualizationController.php
    M libraries/controllers/table/TableSearchController.php
    A libraries/controllers/table/TableStructureController.php
    M libraries/create_addfield.lib.php
    M libraries/db_designer.lib.php
    M libraries/gis/GISFactory.php
    M libraries/gis/GISVisualization.php
    M libraries/import.lib.php
    M libraries/index.lib.php
    M libraries/insert_edit.lib.php
    M libraries/js_escape.lib.php
    M libraries/mult_submits.inc.php
    M libraries/mult_submits.lib.php
    M libraries/plugin_interface.lib.php
    M libraries/pmd_common.php
    M libraries/relation.lib.php
    M libraries/relation_cleanup.lib.php
    M libraries/replication.inc.php
    M libraries/server_engines.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_status_monitor.lib.php
    M libraries/server_status_queries.lib.php
    M libraries/server_status_variables.lib.php
    M libraries/server_user_groups.lib.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/tbl_columns_definition_form.inc.php
    M libraries/tracking.lib.php
    M libraries/transformations.lib.php
    M libraries/user_preferences.inc.php
    M license.php
    M po/cs.po
    M po/el.po
    M po/fr.po
    M po/ia.po
    M po/it.po
    M po/pl.po
    M po/sl.po
    M po/sv.po
    M po/tr.po
    M po/zh_CN.po
    M po/zh_TW.po
    M server_privileges.php
    M server_status_queries.php
    M tbl_structure.php
    M templates/table/chart/tbl_chart.phtml
    M templates/table/gis_visualization/gis_visualization.phtml
    M test/classes/controllers/TableStructureControllerTest.php
    M themes/pmahomme/css/codemirror.css.php
    M themes/pmahomme/css/common.css.php
    M themes/pmahomme/layout.inc.php

  Log Message:
  -----------
  Merge branch 'master' into psr1_master


  Commit: 09292685924b08f6b000bd547a7bc003c0c18824
      https://github.com/phpmyadmin/phpmyadmin/commit/09292685924b08f6b000bd547a7bc003c0c18824
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M libraries/database_interface.inc.php
    M libraries/dbi/DBIDummy.php
    M test/classes/DatabaseInterfaceTest.php

  Log Message:
  -----------
  Fix missing namespace.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: 22d93ba92f4d0be8011b559171f8e68b8275d0c5
      https://github.com/phpmyadmin/phpmyadmin/commit/22d93ba92f4d0be8011b559171f8e68b8275d0c5
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2015-11-15 (Sun, 15 Nov 2015)

  Changed paths:
    M ChangeLog
    M README.rst
    M doc/config.rst
    M js/messages.php
    M js/navigation.js
    M libraries/controllers/table/TableSearchController.php
    M libraries/controllers/table/TableStructureController.php
    M libraries/navigation/NavigationTree.php
    M libraries/plugins/ExportPlugin.php
    M libraries/plugins/export/ExportSql.php
    M libraries/relation.lib.php
    M libraries/sql-parser/src/Components/Condition.php
    M libraries/sql-parser/src/Components/Expression.php
    M libraries/sql-parser/src/Components/OptionsArray.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/Parser.php
    M libraries/sql-parser/src/Statement.php
    M libraries/sql-parser/src/Statements/CreateStatement.php
    M libraries/sql-parser/src/Statements/InsertStatement.php
    M libraries/sql-parser/src/Statements/SelectStatement.php
    M libraries/sql-parser/src/Utils/BufferedQuery.php
    M libraries/sql-parser/src/Utils/Query.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/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 templates/table/relation/common_form.phtml
    M templates/table/structure/display_structure.phtml

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


  Commit: 0e5de28eaaa45bd40a174bc772f76a2dd886be3f
      https://github.com/phpmyadmin/phpmyadmin/commit/0e5de28eaaa45bd40a174bc772f76a2dd886be3f
  Author: Hugues Peccatte <hugues.peccatte at gmail.com>
  Date:   2015-11-15 (Sun, 15 Nov 2015)

  Changed paths:
    M libraries/common.inc.php
    M libraries/dbi/DBIDummy.php
    M libraries/gis/GISFactory.php
    M libraries/gis/GISGeometry.php
    M libraries/gis/GISGeometrycollection.php
    M libraries/gis/GISLinestring.php
    M libraries/gis/GISMultilinestring.php
    M libraries/gis/GISMultipoint.php
    M libraries/gis/GISMultipolygon.php
    M libraries/gis/GISPoint.php
    M libraries/gis/GISPolygon.php
    M libraries/gis/GISVisualization.php
    M libraries/navigation/nodes/Node.php
    M libraries/navigation/nodes/NodeColumn.php
    M libraries/navigation/nodes/NodeColumnContainer.php
    M libraries/navigation/nodes/NodeEvent.php
    M libraries/properties/PropertyItem.php
    M libraries/properties/options/OptionsPropertyGroup.php
    M libraries/properties/options/OptionsPropertyItem.php
    M libraries/properties/options/OptionsPropertyOneItem.php
    M libraries/properties/options/groups/OptionsPropertyMainGroup.php
    M libraries/properties/options/groups/OptionsPropertyRootGroup.php
    M libraries/properties/options/groups/OptionsPropertySubgroup.php
    M libraries/properties/options/items/BoolPropertyItem.php
    M libraries/properties/options/items/DocPropertyItem.php
    M libraries/properties/options/items/HiddenPropertyItem.php
    M libraries/properties/options/items/MessageOnlyPropertyItem.php
    M libraries/properties/options/items/NumberPropertyItem.php
    M libraries/properties/options/items/RadioPropertyItem.php
    M libraries/properties/options/items/SelectPropertyItem.php
    M libraries/properties/options/items/TextPropertyItem.php
    M libraries/properties/plugins/ExportPluginProperties.php
    M libraries/properties/plugins/ImportPluginProperties.php
    M libraries/properties/plugins/PluginPropertyItem.php
    M libraries/properties/plugins/SchemaPluginProperties.php
    A libraries/select_lang.inc.php
    M libraries/select_lang.lib.php
    M test/classes/HeaderTest.php
    M test/classes/MenuTest.php
    M test/classes/plugin/auth/AuthenticationCookieTest.php
    M test/libraries/common/PMA_checkParameters_test.php
    M test/libraries/core/PMA_fatalError_test.php
    M test/libraries/core/PMA_getTableCount_test_dis.php
    M test/libraries/core/PMA_headerLocation_test.php
    M test/libraries/core/PMA_warnMissingExtension_test.php
    M test/libraries/select_lang/PMA_langDetails_test.php
    M test/libraries/select_lang/PMA_langList_test.php
    M test/libraries/select_lang/PMA_langName_test.php
    M test/libraries/select_lang/locale_gettext_test.php

  Log Message:
  -----------
  Remove side effects in declaration files.

Signed-off-by: Hugues Peccatte <hugues.peccatte at gmail.com>


  Commit: ab7942be89e2ac90e96f00a6803b2a2323584a83
      https://github.com/phpmyadmin/phpmyadmin/commit/ab7942be89e2ac90e96f00a6803b2a2323584a83
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2015-11-29 (Sun, 29 Nov 2015)

  Changed paths:
    M PMAStandard/ruleset.xml
    M libraries/DbQbe.php
    M libraries/advisor.lib.php
    M libraries/autoloader.php
    M libraries/bookmark.lib.php
    M libraries/browse_foreigners.lib.php
    M libraries/central_columns.lib.php
    M libraries/cleanup.lib.php
    M libraries/common.inc.php
    M libraries/create_addfield.lib.php
    M libraries/database_interface.inc.php
    M libraries/dbi/DBIDummy.php
    M libraries/display_change_password.lib.php
    M libraries/display_export.lib.php
    M libraries/display_git_revision.lib.php
    M libraries/display_import.lib.php
    M libraries/display_select_lang.lib.php
    M libraries/engines/Bdb.php
    M libraries/engines/Berkeleydb.php
    M libraries/engines/Binlog.php
    M libraries/engines/Innobase.php
    M libraries/engines/Innodb.php
    M libraries/engines/Memory.php
    M libraries/engines/Merge.php
    M libraries/engines/Mrg_Myisam.php
    M libraries/engines/Myisam.php
    M libraries/engines/Ndbcluster.php
    M libraries/engines/Pbxt.php
    M libraries/engines/Performance_Schema.php
    M libraries/export.lib.php
    M libraries/file_listing.lib.php
    M libraries/gis/GISFactory.php
    M libraries/gis/GISGeometry.php
    M libraries/gis/GISGeometrycollection.php
    M libraries/gis/GISLinestring.php
    M libraries/gis/GISMultilinestring.php
    M libraries/gis/GISMultipoint.php
    M libraries/gis/GISMultipolygon.php
    M libraries/gis/GISPoint.php
    M libraries/gis/GISPolygon.php
    M libraries/gis/GISVisualization.php
    M libraries/index.lib.php
    M libraries/insert_edit.lib.php
    M libraries/ip_allow_deny.lib.php
    M libraries/js_escape.lib.php
    M libraries/logging.lib.php
    M libraries/mime.lib.php
    M libraries/mult_submits.lib.php
    M libraries/mysql_charsets.lib.php
    M libraries/navigation/nodes/Node.php
    M libraries/navigation/nodes/NodeColumn.php
    M libraries/navigation/nodes/NodeColumnContainer.php
    M libraries/navigation/nodes/NodeEvent.php
    M libraries/normalization.lib.php
    M libraries/operations.lib.php
    M libraries/plugins/auth/swekey/swekey.auth.lib.php
    M libraries/plugins/import/ImportCsv.php
    M libraries/plugins/import/ImportMediawiki.php
    M libraries/plugins/import/ImportOds.php
    M libraries/plugins/import/ImportShp.php
    M libraries/plugins/import/ImportSql.php
    M libraries/plugins/import/ImportXml.php
    M libraries/plugins/import/ShapeFile.php
    M libraries/plugins/import/ShapeRecord.php
    M libraries/plugins/schema/ExportRelationSchema.php
    M libraries/plugins/schema/RelationStats.php
    M libraries/plugins/schema/SchemaDia.php
    M libraries/plugins/schema/SchemaEps.php
    M libraries/plugins/schema/SchemaPdf.php
    M libraries/plugins/schema/SchemaSvg.php
    M libraries/plugins/schema/TableStats.php
    M libraries/plugins/schema/dia/DiaRelationSchema.php
    M libraries/plugins/schema/dia/RelationStatsDia.php
    M libraries/plugins/schema/dia/TableStatsDia.php
    M libraries/plugins/schema/eps/EpsRelationSchema.php
    M libraries/plugins/schema/eps/RelationStatsEps.php
    M libraries/plugins/schema/eps/TableStatsEps.php
    M libraries/plugins/schema/pdf/Pdf.php
    M libraries/plugins/schema/pdf/PdfRelationSchema.php
    M libraries/plugins/schema/pdf/RelationStatsPdf.php
    M libraries/plugins/schema/pdf/TableStatsPdf.php
    M libraries/plugins/schema/svg/RelationStatsSvg.php
    M libraries/plugins/schema/svg/Svg.php
    M libraries/plugins/schema/svg/TableStatsSvg.php
    M libraries/plugins/transformations/Text_Plain_Link.php
    M libraries/plugins/transformations/Text_Plain_Longtoipv4.php
    M libraries/plugins/transformations/Text_Plain_PreApPend.php
    M libraries/plugins/transformations/Text_Plain_Substring.php
    M libraries/plugins/transformations/abs/Bool2TextTransformationsPlugin.php
    M libraries/plugins/transformations/abs/CodeMirrorEditorTransformationPlugin.php
    M libraries/plugins/transformations/abs/DateFormatTransformationsPlugin.php
    M libraries/plugins/transformations/abs/DownloadTransformationsPlugin.php
    M libraries/plugins/transformations/abs/ExternalTransformationsPlugin.php
    M libraries/plugins/transformations/abs/FormattedTransformationsPlugin.php
    M libraries/plugins/transformations/abs/HexTransformationsPlugin.php
    M libraries/plugins/transformations/abs/ImageUploadTransformationsPlugin.php
    M libraries/plugins/transformations/abs/LongToIPv4TransformationsPlugin.php
    M libraries/plugins/transformations/abs/PreApPendTransformationsPlugin.php
    M libraries/plugins/transformations/abs/RegexValidationTransformationsPlugin.php
    M libraries/plugins/transformations/abs/SQLTransformationsPlugin.php
    M libraries/plugins/transformations/abs/SubstringTransformationsPlugin.php
    M libraries/plugins/transformations/abs/TextFileUploadTransformationsPlugin.php
    M libraries/plugins/transformations/input/Image_JPEG_Upload.php
    M libraries/plugins/transformations/input/Text_Plain_FileUpload.php
    M libraries/plugins/transformations/input/Text_Plain_Iptobinary.php
    M libraries/plugins/transformations/input/Text_Plain_JsonEditor.php
    M libraries/plugins/transformations/input/Text_Plain_RegexValidation.php
    M libraries/plugins/transformations/input/Text_Plain_SqlEditor.php
    M libraries/plugins/transformations/input/Text_Plain_XmlEditor.php
    M libraries/plugins/transformations/output/Application_Octetstream_Download.php
    M libraries/plugins/transformations/output/Application_Octetstream_Hex.php
    M libraries/plugins/transformations/output/Image_JPEG_Inline.php
    M libraries/plugins/transformations/output/Image_JPEG_Link.php
    M libraries/plugins/transformations/output/Image_PNG_Inline.php
    M libraries/plugins/transformations/output/Text_Octetstream_Sql.php
    M libraries/plugins/transformations/output/Text_Plain_Binarytoip.php
    M libraries/plugins/transformations/output/Text_Plain_Bool2Text.php
    M libraries/plugins/transformations/output/Text_Plain_Dateformat.php
    M libraries/plugins/transformations/output/Text_Plain_External.php
    M libraries/plugins/transformations/output/Text_Plain_Formatted.php
    M libraries/plugins/transformations/output/Text_Plain_Imagelink.php
    M libraries/plugins/transformations/output/Text_Plain_Json.php
    M libraries/plugins/transformations/output/Text_Plain_Sql.php
    M libraries/plugins/transformations/output/Text_Plain_Xml.php
    M libraries/properties/PropertyItem.php
    M libraries/properties/options/OptionsPropertyGroup.php
    M libraries/properties/options/OptionsPropertyItem.php
    M libraries/properties/options/OptionsPropertyOneItem.php
    M libraries/properties/options/groups/OptionsPropertyMainGroup.php
    M libraries/properties/options/groups/OptionsPropertyRootGroup.php
    M libraries/properties/options/groups/OptionsPropertySubgroup.php
    M libraries/properties/options/items/BoolPropertyItem.php
    M libraries/properties/options/items/DocPropertyItem.php
    M libraries/properties/options/items/HiddenPropertyItem.php
    M libraries/properties/options/items/MessageOnlyPropertyItem.php
    M libraries/properties/options/items/NumberPropertyItem.php
    M libraries/properties/options/items/RadioPropertyItem.php
    M libraries/properties/options/items/SelectPropertyItem.php
    M libraries/properties/options/items/TextPropertyItem.php
    M libraries/properties/plugins/ExportPluginProperties.php
    M libraries/properties/plugins/ImportPluginProperties.php
    M libraries/properties/plugins/PluginPropertyItem.php
    M libraries/properties/plugins/SchemaPluginProperties.php
    M libraries/relation.lib.php
    M libraries/relation_cleanup.lib.php
    M libraries/replication_gui.lib.php
    M libraries/sanitizing.lib.php
    A libraries/select_lang.inc.php
    M libraries/select_lang.lib.php
    M libraries/select_server.lib.php
    M libraries/server_bin_log.lib.php
    M libraries/server_common.lib.php
    M libraries/server_engines.lib.php
    M libraries/server_plugins.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_status.lib.php
    M libraries/server_status_advisor.lib.php
    M libraries/server_status_monitor.lib.php
    M libraries/server_status_processes.lib.php
    M libraries/server_status_queries.lib.php
    M libraries/server_status_variables.lib.php
    M libraries/server_user_groups.lib.php
    M libraries/server_users.lib.php
    M libraries/session.inc.php
    A libraries/session.lib.php
    M libraries/sql.lib.php
    M test/classes/DatabaseInterfaceTest.php
    M test/classes/HeaderTest.php
    M test/classes/MenuTest.php
    M test/classes/plugin/auth/AuthenticationCookieTest.php
    M test/libraries/common/PMA_checkParameters_test.php
    M test/libraries/core/PMA_fatalError_test.php
    M test/libraries/core/PMA_getTableCount_test_dis.php
    M test/libraries/core/PMA_headerLocation_test.php
    M test/libraries/core/PMA_warnMissingExtension_test.php
    M test/libraries/select_lang/PMA_langDetails_test.php
    M test/libraries/select_lang/PMA_langList_test.php
    M test/libraries/select_lang/PMA_langName_test.php
    M test/libraries/select_lang/locale_gettext_test.php

  Log Message:
  -----------
  Fix merge conflicts

Signed-off-by: Marc Delisle <marc at infomarc.info>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1f4cff8fc6a8...ab7942be89e2