[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 83afce: Make all functions static
Michal Čihař
michal at cihar.com
Wed Sep 19 12:54:42 CEST 2012
Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 83afcee192d38248eb8bf365e7063d3e94f436a6
https://github.com/phpmyadmin/phpmyadmin/commit/83afcee192d38248eb8bf365e7063d3e94f436a6
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-09-15 (Sat, 15 Sep 2012)
Changed paths:
M libraries/CommonFunctions.class.php
Log Message:
-----------
Make all functions static
Commit: b46e8652b754304b009dc3263312066b377c11a3
https://github.com/phpmyadmin/phpmyadmin/commit/b46e8652b754304b009dc3263312066b377c11a3
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-09-15 (Sat, 15 Sep 2012)
Changed paths:
M libraries/CommonFunctions.class.php
Log Message:
-----------
Change the way of method calling in same class from ->method() to self::method()
Commit: 4fdc2241357286e75742b9c5240fdd8483993df4
https://github.com/phpmyadmin/phpmyadmin/commit/4fdc2241357286e75742b9c5240fdd8483993df4
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-09-16 (Sun, 16 Sep 2012)
Changed paths:
M libraries/CommonFunctions.class.php
Log Message:
-----------
Remove the unnecessary parts and renamed the class to PMA_Util
Commit: a6234ae0a35b59fb0b107f2dfad2b01a0cd322b5
https://github.com/phpmyadmin/phpmyadmin/commit/a6234ae0a35b59fb0b107f2dfad2b01a0cd322b5
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-09-16 (Sun, 16 Sep 2012)
Changed paths:
M db_events.php
M db_routines.php
M db_tables_search.php
R libraries/CommonFunctions.class.php
A libraries/Util.class.php
M libraries/common.inc.php
M libraries/tbl_properties.inc.php
M navigation.php
M test/classes/PMA_DBQbe_test.php
M test/classes/PMA_DbSearch_test.php
M test/classes/PMA_DisplayResults_test.php
M test/classes/PMA_File_test.php
M test/classes/PMA_Footer_test.php
M test/classes/PMA_List_Database_test.php
M test/classes/PMA_PDF_test.php
M test/classes/PMA_StorageEngine_test.php
M test/classes/PMA_Theme_Manager_test.php
M test/classes/PMA_Theme_test.php
M test/engines/PMA_StorageEngine_innodb_test.php
M test/engines/PMA_StorageEngine_pbxt_test.php
M test/libraries/PMA_GIS_modifyQuery_test.php
M test/libraries/PMA_bookmark_test.php
M test/libraries/PMA_build_html_for_db_test.php
M test/libraries/PMA_js_escape_test.php
M test/libraries/PMA_operations_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.php
M test/libraries/core/PMA_warnMissingExtension_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:
-----------
Renamed the file to Util.class.php and modify the relavant files
Commit: 0829709064b8ec1170d63d6d9a5828a0a89b34af
https://github.com/phpmyadmin/phpmyadmin/commit/0829709064b8ec1170d63d6d9a5828a0a89b34af
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-09-16 (Sun, 16 Sep 2012)
Changed paths:
M db_operations.php
M db_printview.php
M db_structure.php
M db_tables_search.php
M db_tracking.php
M export.php
M import.php
M libraries/Index.class.php
M libraries/List_Database.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/database_interface.lib.php
M libraries/db_info.inc.php
M libraries/display_export.lib.php
M libraries/display_git_revision.lib.php
M libraries/display_import.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/mult_submits.inc.php
M libraries/mysql_charsets.lib.php
M libraries/navigation_header.inc.php
M libraries/operations.lib.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M libraries/plugins/export/ExportCodegen.class.php
M libraries/plugins/export/ExportLatex.class.php
M libraries/plugins/export/ExportSql.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/relation.lib.php
M libraries/relation_cleanup.lib.php
M libraries/rte/rte_events.lib.php
M libraries/rte/rte_footer.lib.php
M libraries/rte/rte_list.lib.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/Svg_Relation_Schema.class.php
M libraries/schema/Visio_Relation_Schema.class.php
M libraries/server_privileges.lib.php
M libraries/server_synchronize.lib.php
M libraries/sql_query_form.lib.php
M libraries/sqlparser.lib.php
M libraries/structure.lib.php
M libraries/tbl_properties.inc.php
M libraries/tbl_views.lib.php
M libraries/transformations.lib.php
M libraries/user_preferences.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 querywindow.php
M schema_edit.php
M server_binlog.php
M server_databases.php
M server_engines.php
M server_privileges.php
M server_replication.php
M server_status.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_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 user_password.php
Log Message:
-----------
Remove variable
Commit: e6894be57f5735ab525a2f758ad842aacb8ef7bc
https://github.com/phpmyadmin/phpmyadmin/commit/e6894be57f5735ab525a2f758ad842aacb8ef7bc
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-09-16 (Sun, 16 Sep 2012)
Changed paths:
M db_operations.php
M db_printview.php
M db_structure.php
M db_tables_search.php
M db_tracking.php
M export.php
M import.php
M libraries/Index.class.php
M libraries/List_Database.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/database_interface.lib.php
M libraries/db_info.inc.php
M libraries/display_export.lib.php
M libraries/display_git_revision.lib.php
M libraries/display_import.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/mult_submits.inc.php
M libraries/mysql_charsets.lib.php
M libraries/navigation_header.inc.php
M libraries/operations.lib.php
M libraries/plugins/auth/AuthenticationCookie.class.php
M libraries/plugins/export/ExportCodegen.class.php
M libraries/plugins/export/ExportLatex.class.php
M libraries/plugins/export/ExportSql.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/relation.lib.php
M libraries/relation_cleanup.lib.php
M libraries/rte/rte_events.lib.php
M libraries/rte/rte_footer.lib.php
M libraries/rte/rte_list.lib.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/Svg_Relation_Schema.class.php
M libraries/schema/Visio_Relation_Schema.class.php
M libraries/server_privileges.lib.php
M libraries/server_synchronize.lib.php
M libraries/sql_query_form.lib.php
M libraries/sqlparser.lib.php
M libraries/structure.lib.php
M libraries/tbl_properties.inc.php
M libraries/tbl_views.lib.php
M libraries/transformations.lib.php
M libraries/user_preferences.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 querywindow.php
M schema_edit.php
M server_binlog.php
M server_databases.php
M server_engines.php
M server_privileges.php
M server_replication.php
M server_status.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_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 user_password.php
Log Message:
-----------
Renamed ->method() with PMA_Util::method()
Commit: 6971295e9616aa6809ffd58dceb6e6735090f57d
https://github.com/phpmyadmin/phpmyadmin/commit/6971295e9616aa6809ffd58dceb6e6735090f57d
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-09-16 (Sun, 16 Sep 2012)
Changed paths:
M browse_foreigners.php
M db_create.php
M db_datadict.php
M db_printview.php
M db_search.php
M index.php
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/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/common.inc.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_table_exists.lib.php
M libraries/display_create_database.lib.php
M libraries/display_create_table.lib.php
M libraries/display_select_lang.lib.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/operations.lib.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/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/import/ImportCsv.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/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/Visio_Relation_Schema.class.php
M libraries/server_common.inc.php
M libraries/server_privileges.lib.php
M libraries/server_synchronize.lib.php
M libraries/sql_query_form.lib.php
M libraries/structure.lib.php
M libraries/tbl_common.inc.php
M libraries/tbl_info.inc.php
M libraries/tbl_properties.inc.php
M libraries/user_preferences.inc.php
M main.php
M pmd_general.php
M prefs_manage.php
M server_collations.php
M server_plugins.php
M server_synchronize.php
M tbl_alter.php
M tbl_export.php
M tbl_indexes.php
M tbl_printview.php
M tbl_relation.php
M tbl_zoom_select.php
M test/libraries/common/PMA_browseUploadFile_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.php
M test/theme.php
M transformation_wrapper.php
M user_password.php
M view_create.php
M view_operations.php
Log Message:
-----------
Renamed PMA_CommonFunctions::getInstance()-> with PMA_Util::
Commit: 36ffe5e0a3a922648fff83be5cf9e3ff12fceb2e
https://github.com/phpmyadmin/phpmyadmin/commit/36ffe5e0a3a922648fff83be5cf9e3ff12fceb2e
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-09-16 (Sun, 16 Sep 2012)
Changed paths:
M libraries/List_Database.class.php
M libraries/Tracker.class.php
M libraries/insert_edit.lib.php
M libraries/rte/rte_routines.lib.php
M tbl_zoom_select.php
M test/libraries/common/PMA_buildActionTitles_test.php
M test/libraries/common/PMA_quoting_slashing_test.php
Log Message:
-----------
Modified some untracked changes
Commit: 0ff571a1288d02f6ecb6eddaa33d11af9a2a1a7e
https://github.com/phpmyadmin/phpmyadmin/commit/0ff571a1288d02f6ecb6eddaa33d11af9a2a1a7e
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-09-16 (Sun, 16 Sep 2012)
Changed paths:
M libraries/DBQbe.class.php
M libraries/DbSearch.class.php
M libraries/DisplayResults.class.php
M libraries/Menu.class.php
M libraries/Table.class.php
M libraries/TableSearch.class.php
M libraries/schema/Pdf_Relation_Schema.class.php
M libraries/schema/User_Schema.class.php
Log Message:
-----------
Modify classes with property
Commit: a49fd1a1542a816bc47be117b5d8c712064c5f66
https://github.com/phpmyadmin/phpmyadmin/commit/a49fd1a1542a816bc47be117b5d8c712064c5f66
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-09-16 (Sun, 16 Sep 2012)
Changed paths:
M js/db_operations.js
M js/functions.js
M js/tbl_change.js
M libraries/engines/pbxt.lib.php
M libraries/server_variables_doc.php
M test/classes/PMA_DBQbe_test.php
M test/classes/PMA_DbSearch_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_formatSql_test.php
M test/libraries/common/PMA_generateHiddenMaxFileSize_test.php
M test/libraries/common/PMA_getCheckbox_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_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/rte/PMA_RTN_ParameterParser_test.php
Log Message:
-----------
Modified some untracked files
Commit: abf9e1d8db2f7a178dbf359d501daf7670c84294
https://github.com/phpmyadmin/phpmyadmin/commit/abf9e1d8db2f7a178dbf359d501daf7670c84294
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-09-16 (Sun, 16 Sep 2012)
Changed paths:
M ChangeLog
M js/makegrid.js
M libraries/plugins/import/ImportShp.class.php
R libraries/plugins/import/PMA_ShapeFile.class.php
R libraries/plugins/import/PMA_ShapeRecord.class.php
A libraries/plugins/import/ShapeFile.class.php
A libraries/plugins/import/ShapeRecord.class.php
M po/da.po
Log Message:
-----------
Merge remote branch 'upstream/master'
Commit: 13208324d352dc4c5c65cc4f1e7444268a07821f
https://github.com/phpmyadmin/phpmyadmin/commit/13208324d352dc4c5c65cc4f1e7444268a07821f
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-09-18 (Tue, 18 Sep 2012)
Changed paths:
M libraries/Index.class.php
M libraries/List_Database.class.php
M libraries/Table.class.php
M libraries/TableSearch.class.php
M libraries/Tracker.class.php
M libraries/build_html_for_db.lib.php
M libraries/check_user_privileges.lib.php
M libraries/database_interface.lib.php
M libraries/db_info.inc.php
M libraries/display_git_revision.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/mysql_charsets.lib.php
M libraries/operations.lib.php
M libraries/plugins/export/ExportSql.class.php
M libraries/relation.lib.php
M libraries/relation_cleanup.lib.php
M libraries/server_privileges.lib.php
M libraries/server_synchronize.lib.php
M libraries/sql_query_form.lib.php
M libraries/sqlparser.lib.php
M libraries/structure.lib.php
M libraries/tbl_views.lib.php
M libraries/transformations.lib.php
M libraries/user_preferences.lib.php
M navigation.php
M user_password.php
Log Message:
-----------
Removed unnecessary empty lines in functions
Commit: 9cf33ea0cc23963b4cb11483ac2b76eae5cfb3af
https://github.com/phpmyadmin/phpmyadmin/commit/9cf33ea0cc23963b4cb11483ac2b76eae5cfb3af
Author: Chanaka Indrajith <pe.chanaka.ck at gmail.com>
Date: 2012-09-18 (Tue, 18 Sep 2012)
Changed paths:
M libraries/DbSearch.class.php
M libraries/DisplayResults.class.php
M libraries/Error_Handler.class.php
M libraries/Message.class.php
M libraries/StorageEngine.class.php
M libraries/Types.class.php
M libraries/database_interface.lib.php
M libraries/dbi/drizzle.dbi.lib.php
A libraries/dbi/dummy.lib.php
M libraries/dbi/mysql.dbi.lib.php
M libraries/dbi/mysqli.dbi.lib.php
M libraries/mysql_charsets.lib.php
M libraries/opendocument.lib.php
M libraries/structure.lib.php
M libraries/sysinfo.lib.php
M phpunit.xml.dist
M po/th.po
M po/zh_TW.po
M test/classes/PMA_Advisor_test.php
M test/classes/PMA_DBQbe_test.php
M test/classes/PMA_DbSearch_test.php
M test/classes/PMA_DisplayResults_test.php
M test/classes/PMA_Error_Handler_test.php
M test/classes/PMA_Error_test.php
M test/classes/PMA_Footer_test.php
M test/classes/PMA_List_Database_test.php
M test/classes/PMA_Scripts_test.php
M test/classes/PMA_StorageEngine_test.php
M test/classes/PMA_Theme_test.php
M test/classes/PMA_Types_Drizzle_test.php
M test/classes/PMA_Types_MySQL_test.php
M test/classes/PMA_Types_test.php
M test/classes/gis/PMA_GIS_Geometry_test.php
M 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/engines/PMA_StorageEngine_bdb_test.php
M test/engines/PMA_StorageEngine_binlog_test.php
M test/engines/PMA_StorageEngine_innodb_test.php
M test/engines/PMA_StorageEngine_memory_test.php
M test/engines/PMA_StorageEngine_mrg_myisam_test.php
M test/engines/PMA_StorageEngine_myisam_test.php
M test/engines/PMA_StorageEngine_ndbcluster_test.php
M test/engines/PMA_StorageEngine_pbxt_test.php
M test/libraries/PMA_bookmark_test.php
M test/libraries/PMA_build_html_for_db_test.php
M test/libraries/PMA_operations_test.php
R test/libraries/PMA_transformation_getOptions_test.php
A test/libraries/PMA_transformation_test.php
M test/libraries/PMA_zip_test.php
M test/libraries/core/PMA_warnMissingExtension_test.php
A test/libraries/database_interface_test.php
M test/libraries/php-gettext/PMA_FileReader_test.php
M test/libraries/php-gettext/PMA_StreamReader_test.php
M test/libraries/php-gettext/PMA_StringReader_test.php
M test/libraries/php-gettext/PMA_gettext_test.php
M test/libraries/rte/PMA_EVN_getEditorForm_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_TRI_getEditorForm_test.php
M test/libraries/rte/PMA_TRI_getQueryFromRequest_test.php
A test/libraries/sysinfo_test.php
Log Message:
-----------
Resolved conflicts
Commit: 7fe1d6308913969fd38c5a07ba16da1026ee1455
https://github.com/phpmyadmin/phpmyadmin/commit/7fe1d6308913969fd38c5a07ba16da1026ee1455
Author: Michal Čihař <michal at cihar.com>
Date: 2012-09-19 (Wed, 19 Sep 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_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
R libraries/CommonFunctions.class.php
M libraries/DBQbe.class.php
M libraries/DbSearch.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/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
A libraries/Util.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
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_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/operations.lib.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_privileges.lib.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/structure.lib.php
M libraries/tbl_common.inc.php
M libraries/tbl_info.inc.php
M libraries/tbl_properties.inc.php
M libraries/tbl_views.lib.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_DBQbe_test.php
M test/classes/PMA_DbSearch_test.php
M test/classes/PMA_DisplayResults_test.php
M test/classes/PMA_File_test.php
M test/classes/PMA_Footer_test.php
M test/classes/PMA_List_Database_test.php
M test/classes/PMA_PDF_test.php
M test/classes/PMA_StorageEngine_test.php
M test/classes/PMA_Theme_Manager_test.php
M test/classes/PMA_Theme_test.php
M test/engines/PMA_StorageEngine_innodb_test.php
M test/engines/PMA_StorageEngine_pbxt_test.php
M test/libraries/PMA_GIS_modifyQuery_test.php
M test/libraries/PMA_STR_sub_test.php
M test/libraries/PMA_bookmark_test.php
M test/libraries/PMA_build_html_for_db_test.php
M test/libraries/PMA_js_escape_test.php
M test/libraries/PMA_operations_test.php
M test/libraries/PMA_transformation_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.php
M test/libraries/core/PMA_warnMissingExtension_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 pull request #91 from Chanaka/master
PMA_Util static class introduced instead of PMA_CommonFunctions singleton class
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9273cf96cec5...7fe1d6308913
More information about the Git
mailing list