Merge branch 'master' into ajax

diff --cc adminer/db.inc.php
Simple merge

diff --cc adminer/include/connect.inc.php
Simple merge

diff --cc adminer/include/functions.inc.php
Simple merge

diff --cc adminer/select.inc.php
Simple merge

diff --cc adminer/static/editing.js
Simple merge

diff --cc adminer/static/functions.js
index 54728a00a8440c7c15e473bfee38158ccf35ad70,f8478a0074fc86ab4b6b47a4b7950de21e9eeb4f..27a3468f45f8e73849acc61e8d970ec8bd7a7c76
--- 1/adminer/static/functions.js
--- 2/adminer/static/functions.js
+++ b/adminer/static/functions.js
@@@ -254,9 -156,10 +254,10 @@@ function ajaxForm(form, data) 
  /** Display edit field
  * @param HTMLElement
  * @param MouseEvent
 -* @param boolean display textarea instead of input
 +* @param number display textarea instead of input, 2 - load long text
  */
  function selectDblClick(td, event, text) {
+       td.ondblclick = function () { };
        var pos = event.rangeOffset;
        var value = (td.firstChild.firstChild ? td.firstChild.firstChild.data : (td.firstChild.alt ? td.firstChild.alt : td.firstChild.data));
        var input = document.createElement(text ? 'textarea' : 'input');

diff --cc editor/include/adminer.inc.php
Simple merge