gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tyron/master'

Browse Source 
Conflicts:
	libraries/advisor.class.php
This commit is contained in:
Michal Čihař 2011-08-15 10:16:29 +02:00
commit ac4b82ea13
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/advisor.class.php
View File

@ -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;
}