diff --git a/ChangeLog b/ChangeLog index 9b25b5cfb8..747729e4af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ phpMyAdmin - ChangeLog 4.6.2 (not yet released) +- issue #12225 Use https for documentation links + 4.6.1 (2016-05-02) - issue #12120 PMA_Util not found in insert_edit.lib.php - issue #12118 Fixed activation of some languages diff --git a/README b/README index c3078e91b6..0e2fea04a8 100644 --- a/README +++ b/README @@ -12,7 +12,7 @@ Summary phpMyAdmin is intended to handle the administration of MySQL over the web. For a summary of features, list of requirements, and installation instructions, -please see the documentation in the ./doc/ folder or at http://docs.phpmyadmin.net/ +please see the documentation in the ./doc/ folder or at https://docs.phpmyadmin.net/ Copyright --------- diff --git a/README.rst b/README.rst index eda76362aa..fcd41c15d0 100644 --- a/README.rst +++ b/README.rst @@ -44,7 +44,7 @@ If you prefer to follow the git repository, the following branch and tag names m More Information ---------------- -Please see the documentation in the doc folder or at http://docs.phpmyadmin.net/. +Please see the documentation in the doc folder or at https://docs.phpmyadmin.net/. For support or to learn how to contribute code or by translating to your language, visit https://www.phpmyadmin.net/ diff --git a/changelog.php b/changelog.php index bf2fc9899a..95da01d4a5 100644 --- a/changelog.php +++ b/changelog.php @@ -52,7 +52,7 @@ $tracker_url_bug = 'https://sourceforge.net/p/phpmyadmin/bugs/\\1/'; $tracker_url_rfe = 'https://sourceforge.net/p/phpmyadmin/feature-requests/\\1/'; $tracker_url_patch = 'https://sourceforge.net/p/phpmyadmin/patches/\\1/'; $github_url = 'https://github.com/phpmyadmin/phpmyadmin/'; -$faq_url = 'http://docs.phpmyadmin.net/en/latest/faq.html'; +$faq_url = 'https://docs.phpmyadmin.net/en/latest/faq.html'; $replaces = array( '@(https?://[./a-zA-Z0-9.-_-]*[/a-zA-Z0-9_])@' diff --git a/config.sample.inc.php b/config.sample.inc.php index 5c73c2e1b9..e3deeaa0d2 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -5,7 +5,7 @@ * manual configuration. For easier setup you can use setup/ * * All directives are explained in documentation in the doc/ folder - * or at . + * or at . * * @package PhpMyAdmin */ @@ -153,5 +153,5 @@ $cfg['SaveDir'] = ''; /** * You can find more configuration options in the documentation - * in the doc/ folder or at . + * in the doc/ folder or at . */ diff --git a/libraries/Util.php b/libraries/Util.php index 4dc6ad335e..291657d4d8 100644 --- a/libraries/Util.php +++ b/libraries/Util.php @@ -540,7 +540,7 @@ class Util /* Check if we have built local documentation */ if (defined('TESTSUITE')) { /* Provide consistent URL for testsuite */ - return PMA_linkURL('http://docs.phpmyadmin.net/en/latest/' . $url); + return PMA_linkURL('https://docs.phpmyadmin.net/en/latest/' . $url); } elseif (@file_exists('doc/html/index.html')) { if (defined('PMA_SETUP')) { return '../doc/html/' . $url; @@ -549,7 +549,7 @@ class Util } } else { /* TODO: Should link to correct branch for released versions */ - return PMA_linkURL('http://docs.phpmyadmin.net/en/latest/' . $url); + return PMA_linkURL('https://docs.phpmyadmin.net/en/latest/' . $url); } } diff --git a/test/classes/MessageTest.php b/test/classes/MessageTest.php index 9f471ab4cc..b60eae54c9 100644 --- a/test/classes/MessageTest.php +++ b/test/classes/MessageTest.php @@ -361,7 +361,7 @@ class MessageTest extends PMATestCase ), array( '[doc@foo]link[/doc]', - 'link' ), @@ -486,7 +486,7 @@ class MessageTest extends PMATestCase { $this->object->setMessage('[kbd]test[/kbd] [doc@cfg_Example]test[/doc]'); $this->assertEquals( - 'test test', $this->object->getMessage() diff --git a/test/classes/config/FormDisplayTest.php b/test/classes/config/FormDisplayTest.php index 55f01c3ece..5d5ab9ed62 100644 --- a/test/classes/config/FormDisplayTest.php +++ b/test/classes/config/FormDisplayTest.php @@ -335,7 +335,7 @@ class FormDisplayTest extends PMATestCase public function testGetDocLink() { $this->assertEquals( - "./url.php?url=http%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2F" . + "./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2F" . "config.html%23cfg_Servers_3_test_2_", $this->object->getDocLink("Servers/3/test/2/") ); diff --git a/test/libraries/PMA_sanitize_test.php b/test/libraries/PMA_sanitize_test.php index 8b63338a74..a0dcb192d1 100644 --- a/test/libraries/PMA_sanitize_test.php +++ b/test/libraries/PMA_sanitize_test.php @@ -66,7 +66,7 @@ class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase public function testDoc() { $this->assertEquals( - 'doclink', + 'doclink', PMA_sanitize('[doc@foo]doclink[/doc]') ); } @@ -105,8 +105,8 @@ class PMA_Sanitize_Test extends PHPUnit_Framework_TestCase public function testLinkAndXssInHref() { $this->assertEquals( - 'doc[a@javascript:alert(\'XSS\');@target]link', - PMA_sanitize('[a@http://docs.phpmyadmin.net/]doc[/a][a@javascript:alert(\'XSS\');@target]link[/a]') + 'doc[a@javascript:alert(\'XSS\');@target]link', + PMA_sanitize('[a@https://docs.phpmyadmin.net/]doc[/a][a@javascript:alert(\'XSS\');@target]link[/a]') ); } diff --git a/test/libraries/common/PMA_showDocu_test.php b/test/libraries/common/PMA_showDocu_test.php index ade05ea017..72e162dfd7 100644 --- a/test/libraries/common/PMA_showDocu_test.php +++ b/test/libraries/common/PMA_showDocu_test.php @@ -43,7 +43,7 @@ class PMA_ShowDocu_Test extends PHPUnit_Framework_TestCase function testShowDocu() { $this->assertEquals( - 'Documentation', + 'Documentation', PMA\libraries\Util::showDocu('page', 'anchor') );