Browse files

Use docs.phpmyadmin.net instead of phpmyadmin.readthedocs.org

  • Loading branch information...
1 parent 0d2ed1c commit 15b554c8b6761356109034ce7d7f735512f8a826 @nijel nijel committed Nov 13, 2012
View
2 changelog.php
@@ -76,7 +76,7 @@
// FAQ entries
'/FAQ ([0-9]+)\.([0-9a-z]+)/i'
- => '<a href="https://phpmyadmin.readthedocs.org/en/latest/faq.html#faq\\1-\\2">FAQ \\1.\\2</a>',
+ => '<a href="https://docs.phpmyadmin.net/en/latest/faq.html#faq\\1-\\2">FAQ \\1.\\2</a>',
// linking bugs
'/bug\s*#?([0-9]{6,})/i'
View
4 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 <http://phpmyadmin.readthedocs.org/>.
+ * or at <http://docs.phpmyadmin.net/>.
*
* @package PhpMyAdmin
*/
@@ -136,6 +136,6 @@
/*
* You can find more configuration options in the documentation
- * in the doc/ folder or at <http://phpmyadmin.readthedocs.org/>.
+ * in the doc/ folder or at <http://docs.phpmyadmin.net/>.
*/
?>
View
4 libraries/Util.class.php
@@ -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://phpmyadmin.readthedocs.org/en/latest/' . $url);
+ return PMA_linkURL('https://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://phpmyadmin.readthedocs.org/en/latest/' . $url);
+ return PMA_linkURL('https://docs.phpmyadmin.net/en/latest/' . $url);
}
}
View
4 test/classes/PMA_Message_test.php
@@ -349,7 +349,7 @@ public function decodeBBDataProvider()
),
array(
'[doc@foo]link[/doc]',
- '<a href="./url.php?url=https%3A%2F%2Fphpmyadmin.readthedocs.org%2Fen%2Flatest%2Fsetup.html%23foo&amp;lang=en&amp;token=token" target="documentation">link</a>'
+ '<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fsetup.html%23foo&amp;lang=en&amp;token=token" target="documentation">link</a>'
),
);
}
@@ -475,7 +475,7 @@ public function testGetMessageWithMessageWithBBCode()
{
$this->object->setMessage('[kbd]test[/kbd] [doc@cfg_Example]test[/doc]');
$this->assertEquals(
- '<kbd>test</kbd> <a href="./url.php?url=https%3A%2F%2Fphpmyadmin.readthedocs.org%2Fen%2Flatest%2Fcfg.html%23cfg_Example&amp;lang=en&amp;token=token" target="documentation">test</a>',
+ '<kbd>test</kbd> <a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fcfg.html%23cfg_Example&amp;lang=en&amp;token=token" target="documentation">test</a>',
$this->object->getMessage()
);
}
View
6 test/libraries/PMA_sanitize_test.php
@@ -63,7 +63,7 @@ public function testLink()
public function testDoc()
{
$this->assertEquals(
- '<a href="./url.php?url=https%3A%2F%2Fphpmyadmin.readthedocs.org%2Fen%2Flatest%2Fsetup.html%23foo&amp;token=token" target="documentation">doclink</a>',
+ '<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fsetup.html%23foo&amp;token=token" target="documentation">doclink</a>',
PMA_sanitize('[doc@foo]doclink[/doc]')
);
}
@@ -102,8 +102,8 @@ public function testLinkDocXss()
public function testLinkAndXssInHref()
{
$this->assertEquals(
- '<a href="./url.php?url=http%3A%2F%2Fphpmyadmin.readthedocs.org%2F&amp;token=token">doc</a>[a@javascript:alert(\'XSS\');@target]link</a>',
- PMA_sanitize('[a@http://phpmyadmin.readthedocs.org/]doc[/a][a@javascript:alert(\'XSS\');@target]link[/a]')
+ '<a href="./url.php?url=http%3A%2F%2Fdocs.phpmyadmin.net%2F&amp;token=token">doc</a>[a@javascript:alert(\'XSS\');@target]link</a>',
+ PMA_sanitize('[a@http://docs.phpmyadmin.net/]doc[/a][a@javascript:alert(\'XSS\');@target]link[/a]')
);
}
View
2 test/libraries/common/PMA_showDocu_test.php
@@ -28,7 +28,7 @@ function setup()
function testShowDocu()
{
$this->assertEquals(
- '<a href="./url.php?url=https%3A%2F%2Fphpmyadmin.readthedocs.org%2Fen%2Flatest%2Fpage.html%23anchor&amp;server=99&amp;lang=en&amp;token=token" target="documentation"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help" /></a>',
+ '<a href="./url.php?url=https%3A%2F%2Fdocs.phpmyadmin.net%2Fen%2Flatest%2Fpage.html%23anchor&amp;server=99&amp;lang=en&amp;token=token" target="documentation"><img src="themes/dot.gif" title="Documentation" alt="Documentation" class="icon ic_b_help" /></a>',
PMA_Util::showDocu('page', 'anchor')
);

0 comments on commit 15b554c

Please sign in to comment.