diff --git a/changelog.php b/changelog.php
index cfc74e348ff..5435e42bc35 100644
--- a/changelog.php
+++ b/changelog.php
@@ -56,15 +56,15 @@
$replaces = array(
'@(http://[./a-zA-Z0-9.-_-]*[/a-zA-Z0-9_])@'
- => '\\1',
+ => '\\1',
// sourceforge users
'/([0-9]{4}-[0-9]{2}-[0-9]{2}) (.+[^ ]) +<(.*)@users.sourceforge.net>/i'
- => '\\1 \\2',
+ => '\\1 \\2',
'/thanks to ([^\(\r\n]+) \(([-\w]+)\)/i'
- => 'thanks to \\1',
+ => 'thanks to \\1',
'/thanks to ([^\(\r\n]+) -\s+([-\w]+)/i'
- => 'thanks to \\1',
+ => 'thanks to \\1',
// mail address
'/([0-9]{4}-[0-9]{2}-[0-9]{2}) (.+[^ ]) +<(.*@.*)>/i'
@@ -72,59 +72,59 @@
// linking patches
'/patch\s*#?([0-9]{6,})/i'
- => 'patch #\\1',
+ => 'patch #\\1',
// linking RFE
'/(?:rfe|feature)\s*#?([0-9]{6,})/i'
- => 'RFE #\\1',
+ => 'RFE #\\1',
// linking files
'/(\s+)([\\/a-z_0-9\.]+\.(?:php3?|html|pl|js|sh))/i'
- => '\\1\\2',
+ => '\\1\\2',
// FAQ entries
'/FAQ ([0-9]+)\.([0-9a-z]+)/i'
- => 'FAQ \\1.\\2',
+ => 'FAQ \\1.\\2',
// linking bugs
'/bug\s*#?([0-9]{6,})/i'
- => 'bug #\\1',
+ => 'bug #\\1',
// all other 6+ digit numbers are treated as bugs
'/(? 'bug #\\1',
+ => 'bug #\\1',
// GitHub issues
'/issue\s*#?([0-9]{4,5}) /i'
- => 'issue #\\1 ',
+ => 'issue #\\1 ',
// transitioned SF.net project bug/rfe/patch links
// by the time we reach 6-digit numbers, we can probably retire the above links
'/patch\s*#?([0-9]{4,5}) /i'
- => 'patch #\\1 ',
+ => 'patch #\\1 ',
'/(?:rfe|feature)\s*#?([0-9]{4,5}) /i'
- => 'RFE #\\1 ',
+ => 'RFE #\\1 ',
'/bug\s*#?([0-9]{4,5}) /i'
- => 'bug #\\1 ',
+ => 'bug #\\1 ',
'/(? 'bug #\\1 ',
+ => 'bug #\\1 ',
// CVE/CAN entries
'/((CAN|CVE)-[0-9]+-[0-9]+)/'
- => '\\1',
+ => '\\1',
// PMASAentries
'/(PMASA-[0-9]+-[0-9]+)/'
- => '\\1',
+ => '\\1',
// Highlight releases (with links)
'/([0-9]+)\.([0-9]+)\.([0-9]+)\.0 (\([0-9-]+\))/'
=> ''
- . ''
+ . ''
. '\\1.\\2.\\3.0 \\4',
'/([0-9]+)\.([0-9]+)\.([0-9]+)\.([1-9][0-9]*) (\([0-9-]+\))/'
=> ''
- . ''
+ . ''
. '\\1.\\2.\\3.\\4 \\5',
// Highlight releases (not linkable)
diff --git a/libraries/core.lib.php b/libraries/core.lib.php
index a2de9a65742..aed40964e88 100644
--- a/libraries/core.lib.php
+++ b/libraries/core.lib.php
@@ -769,6 +769,8 @@ function PMA_isAllowedDomain($url)
'mariadb.org',
/* php.net domains */
'php.net',
+ /* sourceforge.net domain */
+ 'sourceforge.net',
/* Github domains*/
'github.com','www.github.com',
/* Following are doubtful ones. */