phpmyadmin.net
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Git
October 2011
----- 2024 -----
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
git@phpmyadmin.net
6 participants
164 discussions
Start a n
N
ew thread
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20533-g5029300
by Madhura Jayaratne
The branch, master has been updated via 50293004adc930ee21c0e1136bfd1c85790855fa (commit) from aa4dac81752c6c8d84838f098501fb9770735d73 (commit) - Log ----------------------------------------------------------------- commit 50293004adc930ee21c0e1136bfd1c85790855fa Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Oct 2 06:58:35 2011 +0530 Fix failing tests ----------------------------------------------------------------------- Summary of changes: test/libraries/common/PMA_showPHPDocu_test.php | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php index 09cebbf..6b95d4b 100644 --- a/test/libraries/common/PMA_showPHPDocu_test.php +++ b/test/libraries/common/PMA_showPHPDocu_test.php @@ -20,6 +20,8 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase function setup() { $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme'); + $_SESSION[' PMA_token '] = 'token'; + $GLOBALS['lang'] = 'en'; $GLOBALS['server'] = 99; $GLOBALS['cfg']['ServerDefault'] = 0; } @@ -30,7 +32,8 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase $target = "docu"; $lang = _pgettext('PHP documentation language', 'en'); - $expected = '<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target . '&server=99' + $expected = '<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang + . '%2F' . $target . '&server=99&lang=en&token=token"' . '" target="documentation"><img src="themes/dot.gif" title="' . __('Documentation') . '" alt="' . __('Documentation') . '" class="icon ic_b_help" /></a>'; @@ -43,7 +46,8 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase $target = "docu"; $lang = _pgettext('PHP documentation language', 'en'); - $expected = '[<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target . '&server=99' + $expected = '[<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang + . '%2F' . $target . '&server=99&lang=en&token=token"' . '" target="documentation">' . __('Documentation') . '</a>]'; $this->assertEquals($expected, PMA_showPHPDocu($target)); hooks/post-receive -- phpMyAdmin
12 years, 11 months
1
0
0
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20532-gaa4dac8
by Madhura Jayaratne
The branch, master has been updated via aa4dac81752c6c8d84838f098501fb9770735d73 (commit) via 383d55ff6dd5d179212ccaaa3b734396694f0c9e (commit) from 7bb14bcea9affb0c43076685f049e45719384d4d (commit) - Log ----------------------------------------------------------------- commit aa4dac81752c6c8d84838f098501fb9770735d73 Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Oct 2 02:10:15 2011 +0530 Defining undefined config commit 383d55ff6dd5d179212ccaaa3b734396694f0c9e Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Oct 2 02:07:36 2011 +0530 Revert 7bb14bcea9affb0c43076685f049e45719384d4d ----------------------------------------------------------------------- Summary of changes: test/libraries/common/PMA_showPHPDocu_test.php | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php index 15f8b11..09cebbf 100644 --- a/test/libraries/common/PMA_showPHPDocu_test.php +++ b/test/libraries/common/PMA_showPHPDocu_test.php @@ -11,7 +11,6 @@ /* * Include to test. */ -require_once 'libraries/config.default.php'; require_once 'libraries/core.lib.php'; require_once 'libraries/common.lib.php'; require_once 'libraries/Theme.class.php'; @@ -21,6 +20,8 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase function setup() { $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme'); + $GLOBALS['server'] = 99; + $GLOBALS['cfg']['ServerDefault'] = 0; } function testShwoPHPDocuReplaceHelpImg() @@ -29,7 +30,7 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase $target = "docu"; $lang = _pgettext('PHP documentation language', 'en'); - $expected = '<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target + $expected = '<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target . '&server=99' . '" target="documentation"><img src="themes/dot.gif" title="' . __('Documentation') . '" alt="' . __('Documentation') . '" class="icon ic_b_help" /></a>'; @@ -42,7 +43,7 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase $target = "docu"; $lang = _pgettext('PHP documentation language', 'en'); - $expected = '[<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target + $expected = '[<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target . '&server=99' . '" target="documentation">' . __('Documentation') . '</a>]'; $this->assertEquals($expected, PMA_showPHPDocu($target)); hooks/post-receive -- phpMyAdmin
12 years, 11 months
1
0
0
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20530-g7bb14bc
by Madhura Jayaratne
The branch, master has been updated via 7bb14bcea9affb0c43076685f049e45719384d4d (commit) from 9cd4a96902c6f35944e82baacd45707857fa5a3d (commit) - Log ----------------------------------------------------------------- commit 7bb14bcea9affb0c43076685f049e45719384d4d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Oct 2 01:51:20 2011 +0530 Including undefined config ----------------------------------------------------------------------- Summary of changes: test/libraries/common/PMA_showPHPDocu_test.php | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php index 2bf53d0..15f8b11 100644 --- a/test/libraries/common/PMA_showPHPDocu_test.php +++ b/test/libraries/common/PMA_showPHPDocu_test.php @@ -11,6 +11,7 @@ /* * Include to test. */ +require_once 'libraries/config.default.php'; require_once 'libraries/core.lib.php'; require_once 'libraries/common.lib.php'; require_once 'libraries/Theme.class.php'; hooks/post-receive -- phpMyAdmin
12 years, 11 months
1
0
0
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20529-g9cd4a96
by Madhura Jayaratne
The branch, master has been updated via 9cd4a96902c6f35944e82baacd45707857fa5a3d (commit) via 5a6a74481a341111a4b2e34021753a42a17f908e (commit) from 2f889c0bba879fa4b275e28a2258fd96bfe4884e (commit) - Log ----------------------------------------------------------------- commit 9cd4a96902c6f35944e82baacd45707857fa5a3d Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Oct 2 01:04:32 2011 +0530 Fix failing tests commit 5a6a74481a341111a4b2e34021753a42a17f908e Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: Sun Oct 2 00:59:53 2011 +0530 For PMA_linkURL() applied URLs ----------------------------------------------------------------------- Summary of changes: libraries/sanitizing.lib.php | 4 +++- test/libraries/common/PMA_showPHPDocu_test.php | 5 +++-- test/libraries/core/PMA_getLinks_test.php | 6 +++++- .../core/PMA_warnMissingExtension_test.php | 4 ++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index cbac64d..241af1c 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -17,6 +17,8 @@ function PMA_checkLink($url) $valid_starts = array( 'http://', 'https://', + 'http%3A%2F%2F', + 'https%3A%2F%2F', ); if (defined('PMA_SETUP')) { $valid_starts[] = '../Documentation.html'; @@ -56,7 +58,7 @@ function PMA_replaceBBLink($found) } /* Construct url */ - if (substr($found[1], 0, 4) == 'http') { + if (preg_match('/^https?:\/\//', $found[1])) { $url = PMA_linkURL($found[1]); } else { $url = $found[1]; diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php index 0cd576f..2bf53d0 100644 --- a/test/libraries/common/PMA_showPHPDocu_test.php +++ b/test/libraries/common/PMA_showPHPDocu_test.php @@ -11,6 +11,7 @@ /* * Include to test. */ +require_once 'libraries/core.lib.php'; require_once 'libraries/common.lib.php'; require_once 'libraries/Theme.class.php'; @@ -27,7 +28,7 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase $target = "docu"; $lang = _pgettext('PHP documentation language', 'en'); - $expected = '<a href="
http://php.net/manual/
' . $lang . '/' . $target + $expected = '<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target . '" target="documentation"><img src="themes/dot.gif" title="' . __('Documentation') . '" alt="' . __('Documentation') . '" class="icon ic_b_help" /></a>'; @@ -40,7 +41,7 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase $target = "docu"; $lang = _pgettext('PHP documentation language', 'en'); - $expected = '[<a href="
http://php.net/manual/
' . $lang . '/' . $target + $expected = '[<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target . '" target="documentation">' . __('Documentation') . '</a>]'; $this->assertEquals($expected, PMA_showPHPDocu($target)); diff --git a/test/libraries/core/PMA_getLinks_test.php b/test/libraries/core/PMA_getLinks_test.php index 5d96725..2208bc6 100644 --- a/test/libraries/core/PMA_getLinks_test.php +++ b/test/libraries/core/PMA_getLinks_test.php @@ -26,7 +26,11 @@ class PMA_getLinks_test extends PHPUnit_Framework_TestCase public function testPMA_getPHPDocLink() { $lang = _pgettext('PHP documentation language', 'en'); - $this->assertEquals(PMA_getPHPDocLink('function'), '
http://php.net/manual/
' . $lang . '/function'); + $this->assertEquals( + PMA_getPHPDocLink('function'), + './url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' + . $lang . '%2Ffunction&server=99&lang=en&token=token' + ); } public function providerLinkURL(){ diff --git a/test/libraries/core/PMA_warnMissingExtension_test.php b/test/libraries/core/PMA_warnMissingExtension_test.php index 24128e1..522453d 100644 --- a/test/libraries/core/PMA_warnMissingExtension_test.php +++ b/test/libraries/core/PMA_warnMissingExtension_test.php @@ -24,7 +24,7 @@ class PMA_warnMissingExtension_test extends PHPUnit_Framework_TestCase function testMissingExtentionFatal(){ $ext = 'php_ext'; - $warn = 'The <a href="'.PMA_linkURL(PMA_getPHPDocLink('book.' . $ext . '.php')).'" target="Documentation"><em>'.$ext.'</em></a> extension is missing. Please check your PHP configuration.'; + $warn = 'The <a href="' . PMA_getPHPDocLink('book.' . $ext . '.php') . '" target="Documentation"><em>'.$ext.'</em></a> extension is missing. Please check your PHP configuration.'; ob_start(); PMA_warnMissingExtension($ext, true); @@ -38,7 +38,7 @@ class PMA_warnMissingExtension_test extends PHPUnit_Framework_TestCase $ext = 'php_ext'; $extra = 'Appended Extra String'; - $warn = 'The <a href="'.PMA_linkURL(PMA_getPHPDocLink('book.' . $ext . '.php')).'" target="Documentation"><em>'.$ext.'</em></a> extension is missing. Please check your PHP configuration.'.' '.$extra; + $warn = 'The <a href="' . PMA_getPHPDocLink('book.' . $ext . '.php') . '" target="Documentation"><em>'.$ext.'</em></a> extension is missing. Please check your PHP configuration.'.' '.$extra; ob_start(); PMA_warnMissingExtension($ext, true, $extra); hooks/post-receive -- phpMyAdmin
12 years, 11 months
1
0
0
0
← Newer
1
...
14
15
16
17
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
Results per page:
10
25
50
100
200