mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/11775] Fix doc blocks syntax
  [ticket/11775] Remove spaces at line ends
  [ticket/11775] Split test into multiple steps
  [ticket/11775] Add functional test for moving the last post
  [ticket/11775] Backport moving of the posting functions to 3.0
  [ticket/11775] Fix error when moving the last post to another topic

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
This commit is contained in:
Andreas Fischer
2013-08-15 01:40:08 +02:00
parent 585f692e31 d089f9693a
commit 1ac1b9b7ee
3 changed files with 70 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_framework/phpbb_functional_test_case.php
View File

@@ -957,7 +957,7 @@ class phpbb_functional_test_case extends phpbb_test_case
);
}
/*
/**
* Returns the requested parameter from a URL
*
* @param string $url