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

Merge remote-tracking branch 'origin/QA_4_0'

Browse Source
This commit is contained in:
Michal Čihař 2013-04-22 14:07:15 +02:00
commit 539646d7c0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/Util.class.php
View File

@ -540,9 +540,11 @@ class PMA_Util
/* Provide consistent URL for testsuite */
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;
if (defined('PMA_SETUP')) {
return '../doc/html/' . $url;
} else {
return './doc/html/' . $url;
}
} else {
/* TODO: Should link to correct branch for released versions */
return PMA_linkURL('http://docs.phpmyadmin.net/en/latest/' . $url);