[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-14986-gac4b82e
Michal Čihař
nijel at users.sourceforge.net
Mon Aug 15 10:17:13 CEST 2011
The branch, master has been updated
via ac4b82ea13cbbf28e9024b67a1573cfaf98cdfb9 (commit)
via 08b6d28755dbeb5e8172be847564cd61b9d24c28 (commit)
from 2f04095537690d6e2d96729e2882bad3b6e763dc (commit)
- Log -----------------------------------------------------------------
commit ac4b82ea13cbbf28e9024b67a1573cfaf98cdfb9
Merge: 2f04095 08b6d28
Author: Michal Čihař <michal at cihar.com>
Date: Mon Aug 15 10:16:29 2011 +0200
Merge remote-tracking branch 'tyron/master'
Conflicts:
libraries/advisor.class.php
commit 08b6d28755dbeb5e8172be847564cd61b9d24c28
Author: Tyron Madlener <tyronx at gmail.com>
Date: Fri Aug 12 16:07:13 2011 +0300
External urls from advisory_rules are redirected to url.php
-----------------------------------------------------------------------
Summary of changes:
libraries/advisor.class.php | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/libraries/advisor.class.php b/libraries/advisor.class.php
index a45c76c..ca9fb6f 100644
--- a/libraries/advisor.class.php
+++ b/libraries/advisor.class.php
@@ -140,11 +140,18 @@ class Advisor
$rule['name'] = $this->translate($rule['name']);
$rule['issue'] = $this->translate($rule['issue']);
+ // Replaces {server_variable} with 'server_variable' linking to server_variables.php
$rule['recommendation'] = preg_replace(
'/\{([a-z_0-9]+)\}/Ui',
- '<a href="server_variables.php' . PMA_generate_common_url() . '#filter=\1">\1</a>',
+ '<a href="server_variables.php?' . PMA_generate_common_url() . '#filter=\1">\1</a>',
$this->translate($rule['recommendation']));
+ // Replaces external Links with PMA_linkURL() generated links
+ $rule['recommendation'] = preg_replace(
+ '#href=("|\')(https?://[^\1]+)\1#ie',
+ '\'href="\' . PMA_linkURL("\2") . \'"\'',
+ $rule['recommendation']
+ );
break;
}
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list