[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 8dfb96: Introduce PMA_CommonFunctions class - Git

2 Jul 2012


      Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 8dfb964cdf892f52b50f65d271b5b48d75457f68
      https://github.com/phpmyadmin/phpmyadmin/commit/8dfb964cdf892f52b50f65d271b5...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-06-16 (Sat, 16 Jun 2012)
Changed paths:
    M libraries/common.lib.php
    M libraries/core.lib.php
Log Message:
  -----------
  Introduce PMA_CommonFunctions class
Commit: b214b9807b4c050d64ae3135d5dd2b77f4f5b631
      https://github.com/phpmyadmin/phpmyadmin/commit/b214b9807b4c050d64ae3135d5dd...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
    M libraries/common.lib.php
Log Message:
  -----------
  Renamed all the function names with by PMA_ phrase
Commit: 766466135e0e4dcca26744e72fc277a3d8f05d11
      https://github.com/phpmyadmin/phpmyadmin/commit/766466135e0e4dcca26744e72fc2...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-06-22 (Fri, 22 Jun 2012)
Changed paths:
    M browse_foreigners.php
    M db_create.php
    M db_datadict.php
    M db_operations.php
    M db_printview.php
    M db_qbe.php
    M db_search.php
    M db_structure.php
    M db_tables_search.php
    M db_tracking.php
    M export.php
    M import.php
    M index.php
    M js/db_operations.js
    M js/functions.js
    M js/tbl_change.js
    M libraries/Advisor.class.php
    M libraries/DisplayResults.class.php
    M libraries/File.class.php
    M libraries/Footer.class.php
    M libraries/Header.class.php
    M libraries/Index.class.php
    M libraries/List_Database.class.php
    M libraries/Menu.class.php
    M libraries/Message.class.php
    M libraries/PDF.class.php
    M libraries/RecentTable.class.php
    M libraries/StorageEngine.class.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php
    M libraries/Tracker.class.php
    M libraries/auth/config.auth.lib.php
    M libraries/auth/cookie.auth.lib.php
    M libraries/auth/signon.auth.lib.php
    M libraries/bookmark.lib.php
    M libraries/build_html_for_db.lib.php
    M libraries/check_user_privileges.lib.php
    M libraries/common.inc.php
    M libraries/common.lib.php
    M libraries/config/FormDisplay.tpl.php
    M libraries/core.lib.php
    M libraries/database_interface.lib.php
    M libraries/db_common.inc.php
    M libraries/db_info.inc.php
    M libraries/db_structure.lib.php
    M libraries/db_table_exists.lib.php
    M libraries/display_create_database.lib.php
    M libraries/display_create_table.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/innodb.lib.php
    M libraries/engines/pbxt.lib.php
    M libraries/export/codegen.php
    M libraries/export/htmlword.php
    M libraries/export/latex.php
    M libraries/export/mediawiki.php
    M libraries/export/odt.php
    M libraries/export/php_array.php
    M libraries/export/sql.php
    M libraries/export/texytext.php
    M libraries/export/xml.php
    M libraries/gis/pma_gis_polygon.php
    M libraries/import.lib.php
    M libraries/import/csv.php
    M libraries/import/docsql.php
    M libraries/import/ldi.php
    M libraries/import/xml.php
    M libraries/insert_edit.lib.php
    M libraries/ip_allow_deny.lib.php
    M libraries/js_escape.lib.php
    M libraries/mult_submits.inc.php
    M libraries/mysql_charsets.lib.php
    M libraries/navigation_header.inc.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_gui.lib.php
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_export.lib.php
    M libraries/rte/rte_footer.lib.php
    M libraries/rte/rte_list.lib.php
    M libraries/rte/rte_main.inc.php
    M libraries/rte/rte_routines.lib.php
    M libraries/rte/rte_triggers.lib.php
    M libraries/schema/Dia_Relation_Schema.class.php
    M libraries/schema/Eps_Relation_Schema.class.php
    M libraries/schema/Export_Relation_Schema.class.php
    M libraries/schema/Pdf_Relation_Schema.class.php
    M libraries/schema/Svg_Relation_Schema.class.php
    M libraries/schema/User_Schema.class.php
    M libraries/schema/Visio_Relation_Schema.class.php
    M libraries/server_common.inc.php
    M libraries/server_synchronize.lib.php
    M libraries/server_variables_doc.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlparser.lib.php
    M libraries/tbl_common.inc.php
    M libraries/tbl_info.inc.php
    M libraries/tbl_properties.inc.php
    M libraries/tbl_replace_fields.inc.php
    M libraries/tcpdf/tcpdf.php
    M libraries/transformations.lib.php
    M libraries/transformations/text_plain__dateformat.inc.php
    M libraries/user_preferences.inc.php
    M libraries/user_preferences.lib.php
    M main.php
    M navigation.php
    M pmd_display_field.php
    M pmd_general.php
    M pmd_pdf.php
    M pmd_relation_new.php
    M pmd_relation_upd.php
    M pmd_save_pos.php
    M prefs_manage.php
    M querywindow.php
    M schema_edit.php
    M server_binlog.php
    M server_collations.php
    M server_databases.php
    M server_engines.php
    M server_plugins.php
    M server_privileges.php
    M server_replication.php
    M server_status.php
    M server_synchronize.php
    M server_variables.php
    M sql.php
    M tbl_addfield.php
    M tbl_alter.php
    M tbl_change.php
    M tbl_create.php
    M tbl_export.php
    M tbl_get_field.php
    M tbl_indexes.php
    M tbl_move_copy.php
    M tbl_operations.php
    M tbl_printview.php
    M tbl_relation.php
    M tbl_replace.php
    M tbl_structure.php
    M tbl_tracking.php
    M tbl_zoom_select.php
    M test/libraries/PMA_STR_sub_test.php
    M test/libraries/common/PMA_browseUploadFile_test.php
    M test/libraries/common/PMA_buildActionTitles_test.php
    M test/libraries/common/PMA_cache_test.php
    M test/libraries/common/PMA_checkParameters_test.php
    M test/libraries/common/PMA_contains_nonprintable_ascii_test.php
    M test/libraries/common/PMA_convert_bit_default_value_test.php
    M test/libraries/common/PMA_escapeMySqlWildcards_test.php
    M test/libraries/common/PMA_expandUserString_test.php
    M test/libraries/common/PMA_extractColumnSpec_test.php
    M test/libraries/common/PMA_extractValueFromFormattedSize_test.php
    M test/libraries/common/PMA_foreignKeySupported_test.php
    M test/libraries/common/PMA_formatNumberByteDown_test.php
    M test/libraries/common/PMA_formatSql_test.php
    M test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
    M test/libraries/common/PMA_getCheckbox_test.php
    M test/libraries/common/PMA_getDbLink_test.php
    M test/libraries/common/PMA_getDivForSliderEffect_test.php
    M test/libraries/common/PMA_getDropdown_test.php
    M test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
    M test/libraries/common/PMA_getIcon_test.php
    M test/libraries/common/PMA_getRadioFields_test.php
    M test/libraries/common/PMA_getTitleForTarget_test.php
    M test/libraries/common/PMA_localisedDateTimespan_test.php
    M test/libraries/common/PMA_pow_test.php
    M test/libraries/common/PMA_printableBitValue_test.php
    M test/libraries/common/PMA_quoting_slashing_test.php
    M test/libraries/common/PMA_showDocu_test.php
    M test/libraries/common/PMA_showMessage_test_disabled.php
    M test/libraries/common/PMA_showPHPDocu_test.php
    M test/libraries/common/PMA_stringOperations_test.php
    M test/libraries/common/PMA_unsupportedDatatypes_test.php
    M test/libraries/common/PMA_whichCrlf_test.php
    M test/libraries/core/PMA_headerLocation_test_disabled.php
    M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
    M test/libraries/rte/PMA_RTN_ParameterParser_test.php
    M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
    M test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
    M test/theme.php
    M transformation_wrapper.php
    M user_password.php
    M view_create.php
    M view_operations.php
Log Message:
  -----------
  Implement class behavior of common.lib.php file
Commit: 1cc49d32d94d8981e427a32900dc61ae6ec90149
      https://github.com/phpmyadmin/phpmyadmin/commit/1cc49d32d94d8981e427a32900dc...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
    M ChangeLog
    M js/db_search.js
    M js/functions.js
    M js/server_databases.js
    M libraries/DisplayResults.class.php
    M libraries/Error_Handler.class.php
    M libraries/File.class.php
    M libraries/Footer.class.php
    M libraries/Header.class.php
    M libraries/Menu.class.php
    M libraries/Scripts.class.php
    M libraries/TableSearch.class.php
    M libraries/common.lib.php
    M libraries/error.inc.php
    M libraries/gis/pma_gis_geometrycollection.php
    M libraries/gis_visualization.lib.php
    M libraries/insert_edit.lib.php
    M libraries/rte/rte_routines.lib.php
    M libraries/transformations/text_plain__append.inc.php
    M libraries/user_preferences.inc.php
    M pmd_general.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be@latin.po
    M po/bg.po
    M po/bn.po
    M po/br.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/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.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/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/ko.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/nl.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@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@latin.po
    M po/zh_CN.po
    M po/zh_TW.po
    M querywindow.php
    M server_databases.php
    M server_status.php
    M tbl_change.php
    M tbl_replace.php
    M test/classes/gis/PMA_GIS_Geometry_test.php
    A test/classes/gis/PMA_GIS_Geometrycollection_test.php
    M test/classes/gis/PMA_GIS_Linestring_test.php
    M test/classes/gis/PMA_GIS_Multilinestring_test.php
    M test/classes/gis/PMA_GIS_Multipoint_test.php
    M test/classes/gis/PMA_GIS_Multipolygon_test.php
    M test/classes/gis/PMA_GIS_Point_test.php
    M test/classes/gis/PMA_GIS_Polygon_test.php
    M test/theme.php
Log Message:
  -----------
  Resolved conflicts
Commit: 39d37fafcce29160c4dfe6ef7696de19bebb1d18
      https://github.com/phpmyadmin/phpmyadmin/commit/39d37fafcce29160c4dfe6ef7696...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
    M ChangeLog
    M db_operations.php
    M db_search.php
    M db_structure.php
    M db_tracking.php
    M export.php
    M import_status.php
    M js/functions.js
    M js/server_databases.js
    M libraries/Config.class.php
    M libraries/DisplayResults.class.php
    M libraries/Footer.class.php
    M libraries/Header.class.php
    M libraries/Index.class.php
    M libraries/Menu.class.php
    M libraries/OutputBuffering.class.php
    M libraries/RecentTable.class.php
    M libraries/StorageEngine.class.php
    M libraries/Table.class.php
    M libraries/Tracker.class.php
    M libraries/auth/config.auth.lib.php
    M libraries/auth/cookie.auth.lib.php
    M libraries/build_html_for_db.lib.php
    M libraries/common.lib.php
    M libraries/core.lib.php
    M libraries/database_interface.lib.php
    M libraries/display_import.lib.php
    M libraries/display_import_ajax.lib.php
    M libraries/gis/pma_gis_visualization.php
    M libraries/import.lib.php
    M libraries/insert_edit.lib.php
    M libraries/navigation_header.inc.php
    M libraries/opendocument.lib.php
    M libraries/relation.lib.php
    M libraries/relation_cleanup.lib.php
    M libraries/sanitizing.lib.php
    M libraries/schema/Dia_Relation_Schema.class.php
    M libraries/schema/Eps_Relation_Schema.class.php
    M libraries/schema/Export_Relation_Schema.class.php
    M libraries/schema/Pdf_Relation_Schema.class.php
    M libraries/schema/Svg_Relation_Schema.class.php
    M libraries/schema/User_Schema.class.php
    M libraries/schema/Visio_Relation_Schema.class.php
    M libraries/select_server.lib.php
    M libraries/server_common.inc.php
    M libraries/server_synchronize.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlvalidator.class.php
    R libraries/tbl_replace_fields.inc.php
    M libraries/transformations.lib.php
    M libraries/url_generating.lib.php
    M libraries/zip.lib.php
    M main.php
    M navigation.php
    M pmd_display_field.php
    M pmd_pdf.php
    M pmd_relation_new.php
    M pmd_relation_upd.php
    M pmd_save_pos.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be@latin.po
    M po/bg.po
    M po/bn.po
    M po/br.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/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.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/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/ko.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/nl.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@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@latin.po
    M po/zh_CN.po
    M po/zh_TW.po
    M server_databases.php
    M server_privileges.php
    M tbl_change.php
    M tbl_operations.php
    M tbl_relation.php
    M tbl_replace.php
    M tbl_structure.php
    M tbl_tracking.php
    M test/libraries/core/PMA_fatalError_test.php
    M themes/original/css/navigation.css.php
    M themes/pmahomme/css/navigation.css.php
    M webapp.php
Log Message:
  -----------
  Resolved conflicts
Commit: 659e4e09cb3e4f18ef869a7cdae0889fa2b013cc
      https://github.com/phpmyadmin/phpmyadmin/commit/659e4e09cb3e4f18ef869a7cdae0...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
    M po/es.po
    M po/fr.po
    M po/ko.po
    M po/pt_BR.po
    M po/ru.po
    M po/si.po
    M po/sl.po
    M po/sv.po
    M tbl_structure.php
Log Message:
  -----------
  Merge remote branch 'upstream/master'
Commit: e1ca3a592c80ce6ccb5eac3af3f5acc9f2d8e204
      https://github.com/phpmyadmin/phpmyadmin/commit/e1ca3a592c80ce6ccb5eac3af3f5...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
    M libraries/DisplayResults.class.php
    M libraries/database_interface.lib.php
    M libraries/insert_edit.lib.php
Log Message:
  -----------
  Correction of method calling in some files
Commit: 74de5e3fd3af4c998d6ae929304a3e8fd8f9eb32
      https://github.com/phpmyadmin/phpmyadmin/commit/74de5e3fd3af4c998d6ae929304a...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
    M db_events.php
    M db_routines.php
    M db_tables_search.php
    A libraries/CommonFunctions.class.php
    M libraries/common.inc.php
    R libraries/common.lib.php
    M libraries/tbl_properties.inc.php
    M navigation.php
    M test/classes/PMA_File_test.php
    M test/classes/PMA_List_Database_test.php
    M test/classes/PMA_PDF_test.php
    M test/classes/PMA_Theme_Manager_test.php
    M test/libraries/PMA_GIS_modifyQuery_test.php
    M test/libraries/common/PMA_browseUploadFile_test.php
    M test/libraries/common/PMA_buildActionTitles_test.php
    M test/libraries/common/PMA_cache_test.php
    M test/libraries/common/PMA_checkParameters_test.php
    M test/libraries/common/PMA_contains_nonprintable_ascii_test.php
    M test/libraries/common/PMA_convert_bit_default_value_test.php
    M test/libraries/common/PMA_escapeMySqlWildcards_test.php
    M test/libraries/common/PMA_expandUserString_test.php
    M test/libraries/common/PMA_extractColumnSpec_test.php
    M test/libraries/common/PMA_extractValueFromFormattedSize_test.php
    M test/libraries/common/PMA_foreignKeySupported_test.php
    M test/libraries/common/PMA_formatNumberByteDown_test.php
    M test/libraries/common/PMA_formatSql_test.php
    M test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
    M test/libraries/common/PMA_getCheckbox_test.php
    M test/libraries/common/PMA_getDbLink_test.php
    M test/libraries/common/PMA_getDivForSliderEffect_test.php
    M test/libraries/common/PMA_getDropdown_test.php
    M test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
    M test/libraries/common/PMA_getIcon_test.php
    M test/libraries/common/PMA_getRadioFields_test.php
    M test/libraries/common/PMA_getTitleForTarget_test.php
    M test/libraries/common/PMA_localisedDateTimespan_test.php
    M test/libraries/common/PMA_pow_test.php
    M test/libraries/common/PMA_printableBitValue_test.php
    M test/libraries/common/PMA_quoting_slashing_test.php
    M test/libraries/common/PMA_showDocu_test.php
    M test/libraries/common/PMA_showMessage_test_disabled.php
    M test/libraries/common/PMA_showPHPDocu_test.php
    M test/libraries/common/PMA_stringOperations_test.php
    M test/libraries/common/PMA_unsupportedDatatypes_test.php
    M test/libraries/common/PMA_whichCrlf_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_disabled.php
    M test/libraries/js_escape_test.php
    M test/libraries/rte/PMA_EVN_getEditorForm_test.php
    M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
    M test/libraries/rte/PMA_RTN_ParameterParser_test.php
    M test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
    M test/libraries/rte/PMA_RTN_getEditorForm_test.php
    M test/libraries/rte/PMA_RTN_getExecuteForm_test.php
    M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
    M test/libraries/rte/PMA_TRI_getEditorForm_test.php
    M test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
Log Message:
  -----------
  common.lib.php file renamed to CommonFunctions.class.php
Commit: 038a81b1a82a05868e65ddf86dab9409aa9ffe17
      https://github.com/phpmyadmin/phpmyadmin/commit/038a81b1a82a05868e65ddf86dab...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
    M libraries/Header.class.php
    M libraries/TableSearch.class.php
    M libraries/sql_query_form.lib.php
Log Message:
  -----------
  Resolved comflicts
Commit: 106265a7f8709d6ac95c8600550197725fea5ba3
      https://github.com/phpmyadmin/phpmyadmin/commit/106265a7f8709d6ac95c86005501...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
    M db_operations.php
    M export.php
    M import.php
    M libraries/CommonFunctions.class.php
    M libraries/DisplayResults.class.php
    M libraries/Menu.class.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php
    M libraries/Tracker.class.php
    R libraries/auth/http.auth.lib.php
    R libraries/auth/swekey/authentication.inc.php
    R libraries/auth/swekey/musbe-ca.crt
    R libraries/auth/swekey/swekey.auth.lib.php
    R libraries/auth/swekey/swekey.php
    M libraries/blowfish.php
    M libraries/check_user_privileges.lib.php
    M libraries/common.inc.php
    M libraries/config.default.php
    M libraries/dbi/drizzle.dbi.lib.php
    M libraries/dbi/mysql.dbi.lib.php
    M libraries/dbi/mysqli.dbi.lib.php
    M libraries/display_export.lib.php
    M libraries/display_import.lib.php
    M libraries/display_import_ajax.lib.php
    R libraries/export/csv.php
    R libraries/export/excel.php
    R libraries/export/htmlword.php
    R libraries/export/json.php
    R libraries/export/latex.php
    R libraries/export/ods.php
    R libraries/export/odt.php
    R libraries/export/pdf.php
    R libraries/export/php_array.php
    R libraries/export/sql.php
    R libraries/export/texytext.php
    R libraries/export/xml.php
    R libraries/export/yaml.php
    R libraries/import/README
    R libraries/import/mediawiki.php
    R libraries/import/ods.php
    R libraries/import/shp.php
    R libraries/import/sql.php
    R libraries/import/upload/apc.php
    R libraries/import/upload/noplugin.php
    R libraries/import/upload/session.php
    R libraries/import/upload/uploadprogress.php
    M libraries/plugin_interface.lib.php
    A libraries/plugins/AuthenticationPlugin.class.php
    A libraries/plugins/ExportPlugin.class.php
    A libraries/plugins/ImportPlugin.class.php
    A libraries/plugins/PluginManager.class.php
    A libraries/plugins/PluginObserver.class.php
    A libraries/plugins/TransformationsInterface.int.php
    A libraries/plugins/TransformationsPlugin.class.php
    A libraries/plugins/UploadInterface.int.php
    A libraries/plugins/auth/AuthenticationConfig.class.php
    A libraries/plugins/auth/AuthenticationCookie.class.php
    A libraries/plugins/auth/AuthenticationHttp.class.php
    A libraries/plugins/auth/AuthenticationSignon.class.php
    A libraries/plugins/auth/HordeCipherBlowfishOperations.class.php
    A libraries/plugins/auth/swekey/authentication.inc.php
    A libraries/plugins/auth/swekey/musbe-ca.crt
    A libraries/plugins/auth/swekey/swekey.auth.lib.php
    A libraries/plugins/auth/swekey/swekey.php
    A libraries/plugins/export/ExportCodegen.class.php
    A libraries/plugins/export/ExportCsv.class.php
    A libraries/plugins/export/ExportExcel.class.php
    A libraries/plugins/export/ExportHtmlword.class.php
    A libraries/plugins/export/ExportJson.class.php
    A libraries/plugins/export/ExportLatex.class.php
    A libraries/plugins/export/ExportMediawiki.class.php
    A libraries/plugins/export/ExportOds.class.php
    A libraries/plugins/export/ExportOdt.class.php
    A libraries/plugins/export/ExportPdf.class.php
    A libraries/plugins/export/ExportPhparray.class.php
    A libraries/plugins/export/ExportSql.class.php
    A libraries/plugins/export/ExportTexytext.class.php
    A libraries/plugins/export/ExportXml.class.php
    A libraries/plugins/export/ExportYaml.class.php
    A libraries/plugins/export/PMA_ExportPdf.class.php
    A libraries/plugins/export/TableProperty.class.php
    A libraries/plugins/import/ImportCsv.class.php
    A libraries/plugins/import/ImportDocsql.class.php
    A libraries/plugins/import/ImportLdi.class.php
    A libraries/plugins/import/ImportMediawiki.class.php
    A libraries/plugins/import/ImportOds.class.php
    A libraries/plugins/import/ImportShp.class.php
    A libraries/plugins/import/ImportSql.class.php
    A libraries/plugins/import/ImportXml.class.php
    A libraries/plugins/import/PMA_ShapeFile.class.php
    A libraries/plugins/import/PMA_ShapeRecord.class.php
    A libraries/plugins/import/README
    A libraries/plugins/import/upload/UploadApc.class.php
    A libraries/plugins/import/upload/UploadNoplugin.class.php
    A libraries/plugins/import/upload/UploadProgress.class.php
    A libraries/plugins/import/upload/UploadSession.class.php
    A libraries/plugins/transformations/Application_Octetstream_Download.class.php
    A libraries/plugins/transformations/Application_Octetstream_Hex.class.php
    A libraries/plugins/transformations/Image_JPEG_Inline.class.php
    A libraries/plugins/transformations/Image_JPEG_Link.class.php
    A libraries/plugins/transformations/Image_PNG_Inline.class.php
    A libraries/plugins/transformations/Text_Plain_Append.class.php
    A libraries/plugins/transformations/Text_Plain_Dateformat.class.php
    A libraries/plugins/transformations/Text_Plain_External.class.php
    A libraries/plugins/transformations/Text_Plain_Formatted.class.php
    A libraries/plugins/transformations/Text_Plain_Imagelink.class.php
    A libraries/plugins/transformations/Text_Plain_Link.class.php
    A libraries/plugins/transformations/Text_Plain_Longtoipv4.class.php
    A libraries/plugins/transformations/Text_Plain_Sql.class.php
    A libraries/plugins/transformations/Text_Plain_Substring.class.php
    A libraries/plugins/transformations/abstract/AppendTransformationsPlugin.class.php
    A libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php
    A libraries/plugins/transformations/abstract/DownloadTransformationsPlugin.class.php
    A libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php
    A libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php
    A libraries/plugins/transformations/abstract/HexTransformationsPlugin.class.php
    A libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php
    A libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php
    A libraries/plugins/transformations/abstract/LongToIPv4TransformationsPlugin.class.php
    A libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php
    A libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
    A libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php
    A libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php
    A libraries/plugins/transformations/todo_rewrite/README
    A libraries/plugins/transformations/todo_rewrite/TEMPLATE
    A libraries/plugins/transformations/todo_rewrite/TEMPLATE_MIMETYPE
    A libraries/plugins/transformations/todo_rewrite/generator.sh
    A libraries/plugins/transformations/todo_rewrite/template_generator.sh
    A libraries/plugins/transformations/todo_rewrite/template_generator_mimetype.sh
    M libraries/rte/rte_routines.lib.php
    M libraries/rte/rte_triggers.lib.php
    M libraries/tbl_properties.inc.php
    M libraries/transformations.lib.php
    R libraries/transformations/README
    R libraries/transformations/TEMPLATE
    R libraries/transformations/TEMPLATE_MIMETYPE
    R libraries/transformations/application_octetstream__download.inc.php
    R libraries/transformations/application_octetstream__hex.inc.php
    R libraries/transformations/generator.sh
    R libraries/transformations/image_jpeg__inline.inc.php
    R libraries/transformations/image_jpeg__link.inc.php
    R libraries/transformations/image_png__inline.inc.php
    R libraries/transformations/template_generator.sh
    R libraries/transformations/template_generator_mimetype.sh
    R libraries/transformations/text_plain__append.inc.php
    R libraries/transformations/text_plain__external.inc.php
    R libraries/transformations/text_plain__formatted.inc.php
    R libraries/transformations/text_plain__imagelink.inc.php
    R libraries/transformations/text_plain__link.inc.php
    R libraries/transformations/text_plain__longToIpv4.inc.php
    R libraries/transformations/text_plain__sql.inc.php
    R libraries/transformations/text_plain__substr.inc.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be@latin.po
    M po/bg.po
    M po/bn.po
    M po/br.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/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.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/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/ko.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/nl.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@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@latin.po
    M po/zh_CN.po
    M po/zh_TW.po
    M server_status.php
    M server_variables.php
    M tbl_addfield.php
    M tbl_alter.php
    M tbl_indexes.php
    M tbl_replace.php
    M test/libraries/PMA_blowfish_test.php
    M transformation_overview.php
    M user_password.php
Log Message:
  -----------
  Resolve conflicts
Commit: a76dcc4e4f1ca15404b3fee251fc1f27dffb5131
      https://github.com/phpmyadmin/phpmyadmin/commit/a76dcc4e4f1ca15404b3fee251fc...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
    M db_operations.php
    M db_search.php
    A libraries/db_search.lib.php
    M libraries/display_import_ajax.lib.php
    M po/pt_BR.po
    M po/sk.po
    A test/classes/PMA_DisplayResults_test.php
    A test/classes/PMA_Error_test.php
    M test/classes/PMA_Message_test.php
    M test/libraries/core/PMA_getTableCount_test_dis.php
    M test/libraries/core/PMA_headerLocation_test_disabled.php
Log Message:
  -----------
  Resolve conflicts
Commit: efe7e808673430cb232b84e37f2cc7f68dde05da
      https://github.com/phpmyadmin/phpmyadmin/commit/efe7e808673430cb232b84e37f2c...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-06-30 (Sat, 30 Jun 2012)
Changed paths:
    M import_status.php
    M libraries/DisplayResults.class.php
    M libraries/insert_edit.lib.php
    M po/ru.po
    M po/sl.po
    M tbl_change.php
Log Message:
  -----------
  Merge remote branch 'upstream/master'
Commit: 5b60c7c11e0adf92c8e8ea4f55a1551e23a0a2fa
      https://github.com/phpmyadmin/phpmyadmin/commit/5b60c7c11e0adf92c8e8ea4f55a1...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-06-30 (Sat, 30 Jun 2012)
Changed paths:
    R libraries/auth/config.auth.lib.php
    R libraries/auth/cookie.auth.lib.php
    R libraries/auth/signon.auth.lib.php
    R libraries/export/codegen.php
    R libraries/export/mediawiki.php
    R libraries/import/csv.php
    R libraries/import/docsql.php
    R libraries/import/ldi.php
    R libraries/import/xml.php
    R libraries/transformations/text_plain__dateformat.inc.php
Log Message:
  -----------
  Remove unnecessary files
Commit: a2b013522c8112c02cacf84a956508cf25b87c49
      https://github.com/phpmyadmin/phpmyadmin/commit/a2b013522c8112c02cacf84a9565...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-06-30 (Sat, 30 Jun 2012)
Changed paths:
    M ChangeLog
    M libraries/display_import_ajax.lib.php
    M libraries/insert_edit.lib.php
    M libraries/replication_gui.lib.php
Log Message:
  -----------
  Merge remote branch 'upstream/master'
Commit: a76cd76ced423b104bb73665e46dd1d09139b681
      https://github.com/phpmyadmin/phpmyadmin/commit/a76cd76ced423b104bb73665e46d...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-06-30 (Sat, 30 Jun 2012)
Changed paths:
    M libraries/DisplayResults.class.php
    M libraries/core.lib.php
Log Message:
  -----------
  PMA_mimeDefaultFunction() function moved back to PMA_DisplayResults class
Commit: 4d1eeca8071ea52437d208ea9f90d0aceac84096
      https://github.com/phpmyadmin/phpmyadmin/commit/4d1eeca8071ea52437d208ea9f90...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-06-30 (Sat, 30 Jun 2012)
Changed paths:
    M libraries/DisplayResults.class.php
Log Message:
  -----------
  Fixed some code violations in PMA_DisplayResults class
Commit: e0b8f6f7989d81529f0a427a89991a66124765d1
      https://github.com/phpmyadmin/phpmyadmin/commit/e0b8f6f7989d81529f0a427a8999...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-06-30 (Sat, 30 Jun 2012)
Changed paths:
    M libraries/CommonFunctions.class.php
Log Message:
  -----------
  Fix some code violations in PMA_CommonFunctions class
Commit: e5a4596de76009c54f6d6aac30dea8738a9d56fc
      https://github.com/phpmyadmin/phpmyadmin/commit/e5a4596de76009c54f6d6aac30de...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-06-30 (Sat, 30 Jun 2012)
Changed paths:
    M tbl_replace.php
Log Message:
  -----------
  Merge remote branch 'upstream/master'
Commit: 3fa728f6411767413cf37b028c2a3def43559343
      https://github.com/phpmyadmin/phpmyadmin/commit/3fa728f6411767413cf37b028c2a...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-07-01 (Sun, 01 Jul 2012)
Changed paths:
    M test/classes/PMA_DisplayResults_test.php
Log Message:
  -----------
  Test for _getResettedClassForInlineEdit function in PMA_DisplayResults class
Commit: 30a8228324f106ece4e99322410c792243f1830c
      https://github.com/phpmyadmin/phpmyadmin/commit/30a8228324f106ece4e99322410c...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-07-01 (Sun, 01 Jul 2012)
Changed paths:
    M test/classes/PMA_DisplayResults_test.php
Log Message:
  -----------
  Tests for _getClassForDateTimeRelatedFields function in PMA_DisplayResults class
Commit: b623c59512bdfbd94032fdfb1919f068c41a9b7d
      https://github.com/phpmyadmin/phpmyadmin/commit/b623c59512bdfbd94032fdfb1919...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-07-01 (Sun, 01 Jul 2012)
Changed paths:
    M test/classes/PMA_DisplayResults_test.php
Log Message:
  -----------
  Tests for _getOperationLinksForVerticleTable function in PMA_DisplayResults class
Commit: 9a2900508d714243a544b17452b1da49f3723177
      https://github.com/phpmyadmin/phpmyadmin/commit/9a2900508d714243a544b17452b1...
  Author: Chanaka Indrajith pe.chanaka.ck@gmail.com
  Date:   2012-07-01 (Sun, 01 Jul 2012)
Changed paths:
    M ChangeLog
    M js/db_operations.js
    M main.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be@latin.po
    M po/bg.po
    M po/bn.po
    M po/br.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/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.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/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/ko.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/nl.po
    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@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@latin.po
    M po/zh_CN.po
    M po/zh_TW.po
    A test/classes/PMA_Error_Handler_test.php
    M url.php
Log Message:
  -----------
  Merge remote branch 'upstream/master'
Commit: 2d055c8190117cf962f6c43d401003227a3d1758
      https://github.com/phpmyadmin/phpmyadmin/commit/2d055c8190117cf962f6c43d4010...
  Author: Michal Čihař michal@cihar.com
  Date:   2012-07-01 (Sun, 01 Jul 2012)
Changed paths:
    M browse_foreigners.php
    M db_create.php
    M db_datadict.php
    M db_events.php
    M db_operations.php
    M db_printview.php
    M db_qbe.php
    M db_routines.php
    M db_search.php
    M db_structure.php
    M db_tables_search.php
    M db_tracking.php
    M export.php
    M import.php
    M index.php
    M js/db_operations.js
    M js/functions.js
    M js/tbl_change.js
    M libraries/Advisor.class.php
    A libraries/CommonFunctions.class.php
    M libraries/DisplayResults.class.php
    M libraries/File.class.php
    M libraries/Footer.class.php
    M libraries/Header.class.php
    M libraries/Index.class.php
    M libraries/List_Database.class.php
    M libraries/Menu.class.php
    M libraries/Message.class.php
    M libraries/PDF.class.php
    M libraries/RecentTable.class.php
    M libraries/StorageEngine.class.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php
    M libraries/Tracker.class.php
    M libraries/bookmark.lib.php
    M libraries/build_html_for_db.lib.php
    M libraries/check_user_privileges.lib.php
    M libraries/common.inc.php
    R libraries/common.lib.php
    M libraries/config/FormDisplay.tpl.php
    M libraries/core.lib.php
    M libraries/database_interface.lib.php
    M libraries/db_common.inc.php
    M libraries/db_info.inc.php
    M libraries/db_structure.lib.php
    M libraries/db_table_exists.lib.php
    M libraries/display_create_database.lib.php
    M libraries/display_create_table.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/innodb.lib.php
    M libraries/engines/pbxt.lib.php
    M libraries/gis/pma_gis_polygon.php
    M libraries/import.lib.php
    M libraries/insert_edit.lib.php
    M libraries/ip_allow_deny.lib.php
    M libraries/js_escape.lib.php
    M libraries/mult_submits.inc.php
    M libraries/mysql_charsets.lib.php
    M libraries/navigation_header.inc.php
    M libraries/plugin_interface.lib.php
    M libraries/plugins/auth/AuthenticationConfig.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/auth/AuthenticationSignon.class.php
    M libraries/plugins/export/ExportCodegen.class.php
    M libraries/plugins/export/ExportHtmlword.class.php
    M libraries/plugins/export/ExportLatex.class.php
    M libraries/plugins/export/ExportMediawiki.class.php
    M libraries/plugins/export/ExportOdt.class.php
    M libraries/plugins/export/ExportPhparray.class.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/export/ExportTexytext.class.php
    M libraries/plugins/export/ExportXml.class.php
    M libraries/plugins/import/ImportCsv.class.php
    M libraries/plugins/import/ImportDocsql.class.php
    M libraries/plugins/import/ImportLdi.class.php
    M libraries/plugins/import/ImportXml.class.php
    M libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php
    M libraries/pmd_common.php
    M libraries/relation.lib.php
    M libraries/relation_cleanup.lib.php
    M libraries/replication_gui.lib.php
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_export.lib.php
    M libraries/rte/rte_footer.lib.php
    M libraries/rte/rte_list.lib.php
    M libraries/rte/rte_main.inc.php
    M libraries/rte/rte_routines.lib.php
    M libraries/rte/rte_triggers.lib.php
    M libraries/schema/Dia_Relation_Schema.class.php
    M libraries/schema/Eps_Relation_Schema.class.php
    M libraries/schema/Export_Relation_Schema.class.php
    M libraries/schema/Pdf_Relation_Schema.class.php
    M libraries/schema/Svg_Relation_Schema.class.php
    M libraries/schema/User_Schema.class.php
    M libraries/schema/Visio_Relation_Schema.class.php
    M libraries/server_common.inc.php
    M libraries/server_synchronize.lib.php
    M libraries/server_variables_doc.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlparser.lib.php
    M libraries/tbl_common.inc.php
    M libraries/tbl_info.inc.php
    M libraries/tbl_properties.inc.php
    M libraries/tcpdf/tcpdf.php
    M libraries/transformations.lib.php
    M libraries/user_preferences.inc.php
    M libraries/user_preferences.lib.php
    M main.php
    M navigation.php
    M pmd_display_field.php
    M pmd_general.php
    M pmd_pdf.php
    M pmd_relation_new.php
    M pmd_relation_upd.php
    M pmd_save_pos.php
    M prefs_manage.php
    M querywindow.php
    M schema_edit.php
    M server_binlog.php
    M server_collations.php
    M server_databases.php
    M server_engines.php
    M server_plugins.php
    M server_privileges.php
    M server_replication.php
    M server_status.php
    M server_synchronize.php
    M server_variables.php
    M sql.php
    M tbl_addfield.php
    M tbl_alter.php
    M tbl_change.php
    M tbl_create.php
    M tbl_export.php
    M tbl_get_field.php
    M tbl_indexes.php
    M tbl_move_copy.php
    M tbl_operations.php
    M tbl_printview.php
    M tbl_relation.php
    M tbl_replace.php
    M tbl_structure.php
    M tbl_tracking.php
    M tbl_zoom_select.php
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/PMA_File_test.php
    M test/classes/PMA_List_Database_test.php
    M test/classes/PMA_PDF_test.php
    M test/classes/PMA_Theme_Manager_test.php
    M test/libraries/PMA_GIS_modifyQuery_test.php
    M test/libraries/PMA_STR_sub_test.php
    M test/libraries/common/PMA_browseUploadFile_test.php
    M test/libraries/common/PMA_buildActionTitles_test.php
    M test/libraries/common/PMA_cache_test.php
    M test/libraries/common/PMA_checkParameters_test.php
    M test/libraries/common/PMA_contains_nonprintable_ascii_test.php
    M test/libraries/common/PMA_convert_bit_default_value_test.php
    M test/libraries/common/PMA_escapeMySqlWildcards_test.php
    M test/libraries/common/PMA_expandUserString_test.php
    M test/libraries/common/PMA_extractColumnSpec_test.php
    M test/libraries/common/PMA_extractValueFromFormattedSize_test.php
    M test/libraries/common/PMA_foreignKeySupported_test.php
    M test/libraries/common/PMA_formatNumberByteDown_test.php
    M test/libraries/common/PMA_formatSql_test.php
    M test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
    M test/libraries/common/PMA_getCheckbox_test.php
    M test/libraries/common/PMA_getDbLink_test.php
    M test/libraries/common/PMA_getDivForSliderEffect_test.php
    M test/libraries/common/PMA_getDropdown_test.php
    M test/libraries/common/PMA_getFormattedMaximumUploadSize_test.php
    M test/libraries/common/PMA_getIcon_test.php
    M test/libraries/common/PMA_getRadioFields_test.php
    M test/libraries/common/PMA_getTitleForTarget_test.php
    M test/libraries/common/PMA_localisedDateTimespan_test.php
    M test/libraries/common/PMA_pow_test.php
    M test/libraries/common/PMA_printableBitValue_test.php
    M test/libraries/common/PMA_quoting_slashing_test.php
    M test/libraries/common/PMA_showDocu_test.php
    M test/libraries/common/PMA_showMessage_test_disabled.php
    M test/libraries/common/PMA_showPHPDocu_test.php
    M test/libraries/common/PMA_stringOperations_test.php
    M test/libraries/common/PMA_unsupportedDatatypes_test.php
    M test/libraries/common/PMA_whichCrlf_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_disabled.php
    M test/libraries/js_escape_test.php
    M test/libraries/rte/PMA_EVN_getEditorForm_test.php
    M test/libraries/rte/PMA_EVN_getQueryFromRequest_test.php
    M test/libraries/rte/PMA_RTN_ParameterParser_test.php
    M test/libraries/rte/PMA_RTN_getDataFromRequest_test.php
    M test/libraries/rte/PMA_RTN_getEditorForm_test.php
    M test/libraries/rte/PMA_RTN_getExecuteForm_test.php
    M test/libraries/rte/PMA_RTN_getQueryFromRequest_test.php
    M test/libraries/rte/PMA_TRI_getEditorForm_test.php
    M test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
    M test/theme.php
    M transformation_wrapper.php
    M user_password.php
    M view_create.php
    M view_operations.php
Log Message:
  -----------
  Merge remote-tracking branch 'chanaka/master'
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/1f79beefba07...2d055c819011