From 75a16f45f864aa2bf8630070493faebc1f6f8bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Sun, 4 Dec 2005 23:14:41 +0000 Subject: [PATCH] Use same script tag, use CDATA for scripts (RFE #995065). --- ChangeLog | 3 +++ calendar.php | 8 ++++---- db_printview.php | 6 +++--- export.php | 7 ++++--- libraries/common.lib.php | 13 +++++++++---- libraries/display_export.lib.php | 12 ++++++------ libraries/display_import.lib.php | 4 ++-- libraries/footer.inc.php | 2 +- libraries/sql_query_form.lib.php | 2 +- pdf_pages.php | 14 +++++++------- scripts/setup.php | 6 +++--- tbl_change.php | 12 +++++++----- tbl_printview.php | 6 +++--- tbl_select.php | 2 +- themes.php | 2 +- 15 files changed, 55 insertions(+), 44 deletions(-) diff --git a/ChangeLog b/ChangeLog index f29149551..4849aa034 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - Changelog $Id$ $Source$ +2005-12-05 Michal Čihař + * many files: Use same script tag, use CDATA for scripts (RFE #995065). + 2005-12-04 Marc Delisle * lang/catalan update, thanks to Xavier Navarro (xavin). * server_privileges.php: do not use UNION DISTINCT, as it's not allowed diff --git a/calendar.php b/calendar.php index e24ca43af..4c8b1a71d 100644 --- a/calendar.php +++ b/calendar.php @@ -6,13 +6,13 @@ require_once('./libraries/header_http.inc.php'); $page_title = $strCalendar; require('./libraries/header_meta_style.inc.php'); ?> - - diff --git a/db_printview.php b/db_printview.php index c64bcb461..09ac084bd 100644 --- a/db_printview.php +++ b/db_printview.php @@ -287,8 +287,8 @@ else { */ echo "\n"; ?> -
 ' . "\n"; diff --git a/export.php b/export.php index bf4a8252e..7790a7fb1 100644 --- a/export.php +++ b/export.php @@ -580,8 +580,9 @@ else { . ' ' . "\n"; echo '' . "\n"; echo "\n"; -?> ' . "\n"; echo '' . "\n"; echo '' . "\n"; - echo '' . "\n"; + echo '//]]>' . "\n"; echo '' . "\n"; - echo ' ' . "\n"; } else { @@ -1199,7 +1204,7 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) { echo "\n"; $reload_url = './left.php?' . PMA_generate_common_url((isset($GLOBALS['db']) ? $GLOBALS['db'] : ''), '', '&'); ?> -
@@ -748,10 +748,10 @@ function show_checked_option() {
- diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index d7ef22acf..3f159024b 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -71,7 +71,7 @@ if ($import_type == 'server') { echo ' '; ?> - +
@@ -344,8 +344,8 @@ foreach ($array_sh_page AS $key => $temp_sh_page) { } ?> - -
' . "\n"; ?> - = 5) @@ -583,7 +583,9 @@ foreach ($loop_array AS $vrowcount => $vrow) { ="return unNullify('', '')" tabindex="" id="field__3" value="" /> $vrow) { } if ($type == 'date' || $type == 'datetime' || substr($type, 0, 9) == 'timestamp') { ?> - $table) { */ echo "\n"; ?> -
 ' . "\n"; diff --git a/tbl_select.php b/tbl_select.php index 08d64cd88..7cf09b797 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -92,7 +92,7 @@ if (!isset($param) || $param[0] == '') { //$foreigners = ($cfgRelation['relwork'] ? PMA_getForeigners($db, $table) : FALSE); $foreigners = PMA_getForeigners($db, $table); ?> -