From a402fe1869c3aa0272c0edea4c42e9853b94c277 Mon Sep 17 00:00:00 2001 From: Bryn Divey Date: Tue, 6 Jun 2006 09:51:38 +0000 Subject: [PATCH] First UTF8 steps. --- lib/database/dbutil.inc | 8 +++++++- lib/templating/kt3template.inc.php | 1 + sql/mysql/upgrade/3.0.3.1/utf8.sql | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 177 insertions(+), 1 deletion(-) create mode 100644 sql/mysql/upgrade/3.0.3.1/utf8.sql diff --git a/lib/database/dbutil.inc b/lib/database/dbutil.inc index ba33e3e..573f972 100644 --- a/lib/database/dbutil.inc +++ b/lib/database/dbutil.inc @@ -32,8 +32,14 @@ class DBUtil { function &getDB($db = null) { global $default; if (is_null($db)) { - return $default->_db; + $db = $default->_db; } + + if(!isset($db->_kt_initialized) || !$db->_kt_initialized) { + $db->query("SET NAMES 'utf8'"); + $db->_kt_initialized = true; + } + return $db; } diff --git a/lib/templating/kt3template.inc.php b/lib/templating/kt3template.inc.php index 297a8d6..c37269e 100644 --- a/lib/templating/kt3template.inc.php +++ b/lib/templating/kt3template.inc.php @@ -99,6 +99,7 @@ class KTPage { $aJS[] = 'thirdpartyjs/MochiKit/Iter.js'; $aJS[] = 'thirdpartyjs/MochiKit/DOM.js'; $aJS[] = 'thirdpartyjs/MochiKit/Logging.js'; + $aJS[] = 'thirdpartyjs/MochiKit/Async.js'; $aJS[] = 'resources/js/kt-utility.js'; //$aJS[] = 'resources/js/translate.js'; $aJS[] = 'presentation/i18nJavascript.php'; diff --git a/sql/mysql/upgrade/3.0.3.1/utf8.sql b/sql/mysql/upgrade/3.0.3.1/utf8.sql new file mode 100644 index 0000000..1a158db --- /dev/null +++ b/sql/mysql/upgrade/3.0.3.1/utf8.sql @@ -0,0 +1,169 @@ +ALTER TABLE `active_sessions` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `archive_restoration_request` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `archiving_settings` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `archiving_type_lookup` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `authentication_sources` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `baobab_keys` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `baobab_scan` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `baobab_user_keys` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `comment_searchable_text` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `dashlet_disables` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `data_types` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `discussion_comments` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `discussion_threads` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `documents` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `document_archiving_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `document_content_version` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `document_fields` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `document_fields_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `document_incomplete` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `document_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `document_link_types` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `document_metadata_version` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `document_role_allocations` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `document_searchable_text` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `document_subscriptions` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `document_text` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `document_transactions` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `document_transaction_text` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `document_transaction_types_lookup` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `document_types_lookup` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `document_type_fieldsets_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `document_type_fields_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `fieldsets` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `field_behaviours` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `field_behaviour_options` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `field_orders` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `field_value_instances` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `folders` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `folders_users_roles_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `folder_doctypes_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `folder_searchable_text` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `folder_subscriptions` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `folder_transactions` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `folder_workflow_map` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `groups_groups_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `groups_lookup` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `help` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `help_replacement` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `links` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `metadata_lookup` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `metadata_lookup_tree` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `mime_types` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `news` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `notifications` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `organisations_lookup` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `permissions` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `permission_assignments` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `permission_descriptors` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `permission_descriptor_groups` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `permission_descriptor_roles` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `permission_descriptor_users` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `permission_dynamic_assignments` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `permission_dynamic_conditions` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `permission_lookups` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `permission_lookup_assignments` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `permission_objects` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `plugins` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `plugin_news` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `plugin_type_folder_map` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `quicklinks` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `roles` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `role_allocations` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `saved_searches` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `search_document_user_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `status_lookup` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `system_settings` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `time_period` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `time_unit_lookup` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `trigger_selection` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `type_workflow_map` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `units_lookup` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `units_organisations_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `upgrades` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `users` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `users_groups_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `user_history` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `workflows` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `workflow_actions` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `workflow_documents` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `workflow_states` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `workflow_state_actions` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `workflow_state_permission_assignments` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `workflow_state_transitions` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `workflow_transitions` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_active_sessions` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_archive_restoration_request` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_archiving_settings` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_archiving_type_lookup` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_authentication_sources` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_baobab_keys` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_baobab_user_keys` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_browse_criteria` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_dashlet_disables` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_data_types` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_dependant_document_instance` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_dependant_document_template` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_discussion_comments` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_discussion_threads` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_documents` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_document_archiving_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_document_content_version` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_document_fields` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_document_fields_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_document_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_document_link_types` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_document_metadata_version` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_document_role_allocations` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_document_subscriptions` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_document_transactions` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_document_transaction_types_lookup` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_document_types_lookup` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_document_type_fieldsets_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_document_type_fields_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_fieldsets` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_field_behaviours` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_field_value_instances` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_folders` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_folders_users_roles_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_folder_doctypes_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_folder_subscriptions` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_folder_transactions` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_groups_groups_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_groups_lookup` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_help` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_help_replacement` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_links` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_metadata_lookup` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_metadata_lookup_tree` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_mime_types` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_news` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_notifications` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_organisations_lookup` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_permissions` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_permission_assignments` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_permission_descriptors` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_permission_dynamic_conditions` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_permission_lookups` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_permission_lookup_assignments` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_permission_objects` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_plugins` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_plugin_news` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_quicklinks` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_roles` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_role_allocations` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_saved_searches` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_status_lookup` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_system_settings` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_time_period` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_time_unit_lookup` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_units_lookup` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_units_organisations_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_upgrades` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_users` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_users_groups_link` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_user_history` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_workflows` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_workflow_states` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_workflow_state_permission_assignments` CONVERT TO CHARACTER SET 'utf8'; +ALTER TABLE `zseq_workflow_transitions` CONVERT TO CHARACTER SET 'utf8'; -- libgit2 0.21.4