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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-02-11 08:42:58 +01:00
commit 28b47ffc8c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.php
View File

@ -79,7 +79,7 @@ $replaces = array(
// FAQ entries
'/FAQ ([0-9]+)\.([0-9a-z]+)/i'
=> '<a href="https://docs.phpmyadmin.net/en/latest/faq.html#faq\\1-\\2">FAQ \\1.\\2</a>',
=> '<a href="http://docs.phpmyadmin.net/en/latest/faq.html#faq\\1-\\2">FAQ \\1.\\2</a>',
// linking bugs
'/bug\s*#?([0-9]{6,})/i'

4
libraries/Util.class.php
View File

@ -538,14 +538,14 @@ class PMA_Util
/* Check if we have built local documentation */
if (defined('TESTSUITE')) {
/* Provide consistent URL for testsuite */
return PMA_linkURL('https://docs.phpmyadmin.net/en/latest/' . $url);
return PMA_linkURL('http://docs.phpmyadmin.net/en/latest/' . $url);
} else if (file_exists('doc/html/index.html')) {
return './doc/html/' . $url;
} else if (defined('PMA_SETUP') && file_exists('../doc/html/index.html')) {
return '../doc/html/' . $url;
} else {
/* TODO: Should link to correct branch for released versions */
return PMA_linkURL('https://docs.phpmyadmin.net/en/latest/' . $url);
return PMA_linkURL('http://docs.phpmyadmin.net/en/latest/' . $url);
}
}