[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-1083-gb78bd77
Marc Delisle
lem9 at users.sourceforge.net
Thu Feb 24 11:23:36 CET 2011
The branch, master has been updated
via b78bd77e415fdb1d1574e3e5f9b9cd397e221b9c (commit)
from 147a1836f5e3d13245f284272a5e44afd05c311d (commit)
- Log -----------------------------------------------------------------
commit b78bd77e415fdb1d1574e3e5f9b9cd397e221b9c
Author: Marc Delisle <marc at infomarc.info>
Date: Thu Feb 24 05:21:24 2011 -0500
For bug 3168757:
- Change default link length limit to 2000
- Add text next to the image
-----------------------------------------------------------------------
Summary of changes:
libraries/common.lib.php | 9 ++++++++-
libraries/config.default.php | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index f132e75..4023cb2 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1870,7 +1870,14 @@ function PMA_linkOrButton($url, $message, $tag_params = array(),
. implode(' ', $tag_params_strings)
. ' src="' . preg_replace(
'/^.*\ssrc="([^"]*)".*$/si', '\1', $message) . '"'
- . ' value="' . $displayed_message . '" title="' . $displayed_message . '" />';
+ . ' value="' . $displayed_message . '" title="' . $displayed_message . '" />';
+ // Here we cannot obey PropertiesIconic completely as a
+ // generated link would have a length over LinkLengthLimit
+ // but we can at least show the message.
+ // If PropertiesIconic is false or 'both'
+ if ($GLOBALS['cfg']['PropertiesIconic'] !== true) {
+ $ret .= ' ' . $displayed_message;
+ }
}
} else {
$message = trim(strip_tags($message));
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 9fece7a..604030b 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2590,7 +2590,7 @@ $cfg['CheckConfigurationPermissions'] = true;
* is replaced by form with button.
* This is required as some web servers (IIS) have problems with long URLs.
*/
-$cfg['LinkLengthLimit'] = 1000;
+$cfg['LinkLengthLimit'] = 2000;
/*******************************************************************************
* SQL Parser Settings
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list