From 3ea273809a93108059f995977b7e871162e06ae3 Mon Sep 17 00:00:00 2001 From: Herman van Rink Date: Wed, 3 Mar 2010 10:34:14 +0000 Subject: [PATCH] Backported remaining part of rev 13423 and 13424 to QA_3_3 --- libraries/display_import_ajax.lib.php | 6 +++--- libraries/server_synchronize.lib.php | 2 +- server_synchronize.php | 6 +++--- themes/darkblue_orange/img/new_data.jpg | Bin 0 -> 1925 bytes 4 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 themes/darkblue_orange/img/new_data.jpg diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php index cf75da30f..c05cd4dc9 100644 --- a/libraries/display_import_ajax.lib.php +++ b/libraries/display_import_ajax.lib.php @@ -31,7 +31,7 @@ $plugins = array( "uploadprogress", "apc", "noplugin" - ); // available plugins. Each plugin has own checkfunction in upload_functions.php and own file with functions in upload_#KEY#.php + ); // available plugins. Each plugin has own checkfunction in display_import_ajax.lib.php and own file with functions in upload_#KEY#.php // select available plugin foreach ($plugins as $plugin) { @@ -40,8 +40,8 @@ foreach ($plugins as $plugin) { if ($check()) { $_SESSION[$SESSION_KEY]["handler"] = $plugin; include_once("import/upload/" . $plugin . ".php"); - break; - } + break; + } } /** diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php index 0716f98e0..8978cc655 100644 --- a/libraries/server_synchronize.lib.php +++ b/libraries/server_synchronize.lib.php @@ -1334,7 +1334,7 @@ function PMA_displayQuery($query) { function PMA_syncDisplayHeaderSource($src_db) { echo '
'; - echo ''; + echo '
'; echo ''; echo '
' . $GLOBALS['strDatabase_src'] . ': ' . $src_db . '
('; if ('cur' == $_SESSION['src_type']) { diff --git a/server_synchronize.php b/server_synchronize.php index 5a467614e..7d84ce70b 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -255,7 +255,7 @@ if ((isset($_REQUEST['submit_connect']))) { */ echo '
' . PMA_generate_common_hidden_inputs('', ''); - echo ' + echo '

' . ($GLOBALS['cfg']['MainPageIconic'] @@ -455,7 +455,7 @@ if ((isset($_REQUEST['submit_connect']))) { * This fieldset displays the checkbox to confirm deletion of previous rows from target tables */ echo '
-

' . $strTableDeleteRows . '

+

'; echo '' . $strTableDeleteRows . '

+

'; echo '
'; diff --git a/themes/darkblue_orange/img/new_data.jpg b/themes/darkblue_orange/img/new_data.jpg new file mode 100644 index 0000000000000000000000000000000000000000..08d30d34a728e7c558c9fb97b7e34063b4ae1eb4 GIT binary patch literal 1925 zcmex=Bm<7(6|-7&sUh7}yx37+Dz@85kJC z7#J9&q3k#Y1_ljAX0SLDg9L*iBNKxF0|P@E0|NsiGemtE0|NsyGb30H!~g#W7#J8p zR)F~lAax833;~Imc_n&&t|1C##(KtP3=7&A8TvOeF#NyG;LO0p2m&CI2?SV}K_n{+ z3o{EFD;paavvYE=v2(Jsv2k#7aB_hF8wWQJHy00x12TjWq=$)#m6@59i=B-fq=Gd3 z{{Vv^2ZJ($GBcwR1Ct;lvmoRDBMkBk42-NG*D-=Z2IMmaMkZz!RyKAHPA=~MM;NvW zFfcJPGc&O;v$C?VFfcIIGBPnUun4jWDH=Mm2?r*!D;0_uHBMZ}q3pErplHy=4=Tn< zMNOPsV&W2#QmSg|8k$-rre@|AmR8O#u5Rugo?gKrp<&?>kx|JhscGpMnOVgprDf$6 zl~v6xt!?ccon4bAPnkMx`iz;g7A;<~blLJ1D_3pWyk+aQ?K^hvI&}ER(PPI?oIG{u z@|COCuHU$M>*1rvPo6$|{^I4UkDoq&`TFhqkDtFl{$gZchIk8uS~;l_iU%Emz-M3agxa*3&!JXHM%@*3D@ z#CfcVET6$WhVa)d1|DWc1|~sfK?ZwOo_*Qut zudeKWhMDXS`TsK*U#Yun|0#X`hmiW;GwQzv{7Bp9@VD2F^+)ozz90V?mj2QB*tfnu zdHKCtasIaFW^O(guXf9`A@;#~RfZ=erXThs9t-`EEZuY{;Ba;3qoo?hK0onX&a(CC zw0Cu3+k>BNey6Z{a#Fz+&5PeAt+^HVU3XTY_nW;x_pGU{|Iff{{9CU6(#88fC)5f2 zXZUOzJO7~dd4_+N?kVm1(EjG}e+G8$it~@y)+VRq>zC|jd2P>a8r@x8@Tx7n@A_fC zlXBl(?>R`8N}d$`1{C?f;$q&v5iV!>^hTODkrocS@|e-eIsaH%25; z>Q$bpa%4#FLP_&%$Jl!|Yt3fueY^F~o88^39~VbiSU$WG8mhKzmFD_Vvu|Cm)?B?D zJ%4fh2mkqUe>{J*|F$?^`!W3y@B6N=YlR=>_w6zHr*!4bnz!%Pzb)w(d-W@H$>!s! zEMkv>bJN*Aiv%vVNaNUfRCM-#2A0eJ877y0l>a-2{b>K+h&shZ`$O$+{QS@GZRUT5 z$u|EPnil_OxO4bF!>abfrk}WDcVtGL>c{6@IVQ12w$?#ix$eO`1)Zfm zQ;pP~+3;*;{A&8`TlWV;`^>-M-+up{mGaT@qWB~ABa(lNZe7^?+jE2Xe+KS9>e=7= zwW}(3+uZ$azV7XgJ3CMOeEd)GKf~V@^)D6e82>XIso(pb;n}SH`XAZbKL2@ce7bOF zin4m!lx0_zo|?VaT=etPay#R$O+DugjwO7QuvlqjRFt{9v^oBlw~?J()E}k4opn-w zT(3X>ySPUAalXKh{Rg+p$zJ#p&+e~!YT*tAo6jC67BaD(!8KSPu8e}+@R zCI1 zhVU~5+gS?z;*Uzm_$jqoMdVnmn38O+{{C2b?(S`Omh4uUcK1)t^mgMlYQ=49!{#Kq zO`6x`yT8ildTey=`iXDiKls}JG>;ej&v5fVO~ikOtL=}ZH2yO*W&US4x$8&&zjMrw zj{jR@FK{t__xxp2a#sHtnyTu~{B{y6_*7MEi;Hd6eLC?b%K5ybt4IL*|C<0&uR`zu literal 0 HcmV?d00001