From 5b73bf978872f7964d608f997d5907044d25d56c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 22 Apr 2013 14:05:40 +0200 Subject: [PATCH] Fix generating links to docs This makes correct links to docs when run from setup. See bug #3886 and gh issue #279. --- libraries/Util.class.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libraries/Util.class.php b/libraries/Util.class.php index f9048e9b25..4e955fb76d 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -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);