Permalink
Browse files

Use plain http for docs.phpmyadmin.net as the SSL certificate is only…

… for *.readthedocs.org
  • Loading branch information...
1 parent 526e56d commit af37acd845afd5cae0bf906ab22fe94fd3010458 @helmo helmo committed Feb 8, 2013
Showing with 3 additions and 3 deletions.
  1. +1 −1 changelog.php
  2. +2 −2 libraries/Util.class.php
View
@@ -79,7 +79,7 @@
// 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'
View
@@ -538,14 +538,14 @@ public static function getDocuLink($page, $anchor = '')
/* 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);
}
}

0 comments on commit af37acd

Please sign in to comment.