Commit graph

15040 commits

Author SHA1 Message Date
Erik Frèrejean
cac3936066 [ticket/11283] Extension manager follow symlinks.
All extensions are located in the `phpBB/ext` directory,
however the `phpbb_extension_manager::all_available()`
method only looks into actual directories and ignores symlinks.

Add the `RecursiveDirectoryIterator::FOLLOW_SYMLINKS` flag to
the `new RecursiveDirectoryIterator` call so that you can store
extensions in a different location and use symlinks so that
phpBB can recognise them.

PHPBB3-11283
2012-12-23 16:20:37 +01:00
Oleg Pudeyev
3701d83ecb Merge PR #1133 branch 'marc1706/ticket/10954' into develop
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/10954:
  [ticket/10954] Add missing semi-colon
  [ticket/10954] Make sure to mark subforums unread and add small fixes
  [ticket/10954] Miscellaneous coding fixes
  [ticket/10954] Use quotes in attribute selectors and reduce use of each
  [ticket/10954] Change currentObject to $this for consistency
  [ticket/10954] Use function for closing alert popup
  [ticket/10954] Simplify marking forums read and fix topic marking
  [ticket/10954] Join array of class names instead of creating a string
  [ticket/10954] Fix coding guidelines infractions
  [ticket/10954] Change behavior of marking topics/forums
  [ticket/10954] Fix scope of current_object
  [ticket/10954] Only call $(this) once and reduce number of DOM traversals
  [ticket/10954] Modify is_ajax check for consistency
  [ticket/10954] Mark topics read without popup
  [ticket/10954] Mark forums read without popup or page refresh
2012-12-19 21:05:33 -05:00
Oleg Pudeyev
e444f5bf2a Merge PR #1150 branch 'marc1706/ticket/10803' into develop
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/10803:
  [ticket/10803] Show failure message until user dismisses it
2012-12-18 18:48:51 -05:00
Marc Alexander
693778fa07 [ticket/10803] Show failure message until user dismisses it
PHPBB3-10803
2012-12-18 23:42:14 +01:00
Marc Alexander
daf9de689a [ticket/10954] Add missing semi-colon
PHPBB3-10954
2012-12-18 16:24:58 +01:00
Oleg Pudeyev
3af5531d0d Merge PR #1147 branch 'marc1706/ticket/10763' into develop
* marc1706/ticket/10763:
  [ticket/10763] Use self when calling get_extension() in filespec class
  [ticket/10763] Make functions for remote avatars static
2012-12-18 04:11:56 -05:00
Marc Alexander
55b5336b02 [ticket/10954] Make sure to mark subforums unread and add small fixes
PHPBB3-10954
2012-12-18 09:55:22 +01:00
Marc Alexander
fb60f603ba [ticket/10954] Miscellaneous coding fixes
Remove obsolete or unneeded code. Also fix the behavior of removing
icon_topic_newest by actually removing the link to the first unread post
instead of just removing the icon.

PHPBB3-10954
2012-12-18 00:48:50 +01:00
Marc Alexander
4ae0c78782 [ticket/10763] Use self when calling get_extension() in filespec class
PHPBB3-10763
2012-12-17 19:17:32 +01:00
Marc Alexander
54d96dfac7 [ticket/10763] Make functions for remote avatars static
fileupload::image_types() and filespec::get_extension() are called
statically while submitting the form for the remote avatar. Make them
static as described in the ticket in order to prevent a PHP notice.
Also change the tests to use the static functions.

PHPBB3-10763
2012-12-17 17:42:13 +01:00
Oleg Pudeyev
da2f0757d7 Merge PR #1140 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8610] Update comment
  [ticket/8610] Do not use requests to submit posts except in posting_test.php
  [ticket/8610] Move posting helpers to separate file
  [ticket/8610] Create helper functions to create topic/post in functional tests
  [ticket/8610] Use phpbb_update_rows_avoiding_duplicates
  [ticket/8610] Revert some funky merging I did from rebase
  [ticket/8610] Add some comments
  [ticket/8610] Update Bookmarks and Subscriptions when splitting topics
  [ticket/8610] Update Bookmarks when merging posts into another topic
  [ticket/8610] Update Bookmarks when forking topics
  [ticket/8610] Update Bookmarks when merging topics
2012-12-16 16:48:15 -05:00
Oleg Pudeyev
a288c4b66b Merge PR #1140 branch 'EXreaction/ticket/8610' into develop-olympus
* EXreaction/ticket/8610:
  [ticket/8610] Update comment
  [ticket/8610] Do not use requests to submit posts except in posting_test.php
  [ticket/8610] Move posting helpers to separate file
  [ticket/8610] Create helper functions to create topic/post in functional tests
  [ticket/8610] Use phpbb_update_rows_avoiding_duplicates
  [ticket/8610] Revert some funky merging I did from rebase
  [ticket/8610] Add some comments
  [ticket/8610] Update Bookmarks and Subscriptions when splitting topics
  [ticket/8610] Update Bookmarks when merging posts into another topic
  [ticket/8610] Update Bookmarks when forking topics
  [ticket/8610] Update Bookmarks when merging topics
2012-12-16 16:24:48 -05:00
Marc Alexander
703b77cb77 [ticket/10954] Use quotes in attribute selectors and reduce use of each
PHPBB3-10954
2012-12-16 01:06:32 +01:00
Marc Alexander
ec0241d2ef [ticket/10954] Change currentObject to $this for consistency
PHPBB3-10954
2012-12-16 00:59:12 +01:00
Marc Alexander
46cc204523 [ticket/10954] Use function for closing alert popup
PHPBB3-10954
2012-12-16 00:57:53 +01:00
Nathan Guse
0f35f94398 Merge remote-tracking branch 'remotes/bantu/ticket/11273' into develop
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11273:
  [ticket/11273] Add space before MiB to Sphinx "Indexer memory limit" input box.
2012-12-15 17:07:01 -06:00
Andreas Fischer
0666499468 [ticket/11273] Add space before MiB to Sphinx "Indexer memory limit" input box.
PHPBB3-11273
2012-12-15 23:54:49 +01:00
Marc Alexander
f4ff335369 [ticket/10954] Simplify marking forums read and fix topic marking
PHPBB3-10954
2012-12-15 23:48:33 +01:00
Nathan Guse
649e009f7b [ticket/8610] Update comment
PHPBB3-8610
2012-12-15 16:23:48 -06:00
Marc Alexander
b90a56a409 [ticket/10954] Join array of class names instead of creating a string
Previously the string for selecting the correct classes was created
directly. Due to that a subsequent comma had to be removed. By joining the
array of class names with a separator this can be omitted.

PHPBB3-10954
2012-12-15 23:23:32 +01:00
Nathan Guse
175b6deb6d [ticket/8610] Do not use requests to submit posts except in posting_test.php
Moving my functional test functions from posting_helpers.php to
posting_test.php since it is a bit nicer and more reusable if
posting_test.php is to be expanded in the future.

PHPBB3-8610
2012-12-15 16:22:54 -06:00
Marc Alexander
61ef870fd5 [ticket/10954] Fix coding guidelines infractions
PHPBB3-10954
2012-12-15 21:12:52 +01:00
Nathan Guse
b6778802b3 Merge remote-tracking branch 'remotes/Oleg/ticket/11162' into develop
# By Oleg Pudeyev
# Via Oleg Pudeyev
* remotes/Oleg/ticket/11162:
  [ticket/11162] Chase dbal autoloading changes in develop.
2012-12-15 10:48:06 -06:00
Andreas Fischer
762cb074c3 Merge remote-tracking branch 'p/ticket/11268' into develop
* p/ticket/11268:
  [ticket/11268] Delete phpbb_db_driver_mysql4 as there is no such thing.
2012-12-15 01:35:30 +01:00
Oleg Pudeyev
d1eb3449af [ticket/11268] Delete phpbb_db_driver_mysql4 as there is no such thing.
PHPBB3-11268
2012-12-14 14:05:46 -05:00
Oleg Pudeyev
85248cd63d Merge PR #1142 branch 'nickvergessen/ticket/11250' into develop
* nickvergessen/ticket/11250:
  [ticket/11250] Use user defined message as incomplete message
  [ticket/11250] Add tests for simple nesting and code
  [ticket/11250] Run tests by default and add an option for incomplete ones
  [ticket/11250] Fix parsing result with special chars
  [ticket/11250] Add tests for size and attachment
  [ticket/11250] Fix method names
  [ticket/11250] Add some comments and fix a description
  [ticket/11250] Add some more tests for quotes
  [ticket/11250] Move quote special cases from class to unit tests
  [ticket/11250] Add parsing tests for our basic bbcodes in simple cases
2012-12-14 13:31:16 -05:00
Joas Schilling
ebe1f5d8da [ticket/11250] Use user defined message as incomplete message
PHPBB3-11250
2012-12-14 18:31:12 +01:00
Marc Alexander
16c021e986 [ticket/10954] Change behavior of marking topics/forums
It will now display a popup message for 3 seconds which will confirm the
taken action. The amount of DOM traversals have been significantly reduced
and jQuery.each is now used instead of for loops. Additionally, it is now
possible to click on the mark topics/forums read links without triggering
an AJAX error.

PHPBB3-10954
2012-12-14 15:46:45 +01:00
Joas Schilling
4f080ba0d6 [ticket/11250] Add tests for simple nesting and code
PHPBB3-11250
2012-12-14 14:29:11 +01:00
Joas Schilling
8bbf3a788f [ticket/11250] Run tests by default and add an option for incomplete ones
PHPBB3-11250
2012-12-14 13:59:48 +01:00
Joas Schilling
1e5da1417a [ticket/11250] Fix parsing result with special chars
: . and [ are replaced by their html representation if they are text only

PHPBB3-11250
2012-12-14 13:58:39 +01:00
Joas Schilling
cce821f99d [ticket/11250] Add tests for size and attachment
PHPBB3-11250
2012-12-14 13:09:56 +01:00
Joas Schilling
bf312b5293 [ticket/11250] Fix method names
PHPBB3-11250
2012-12-14 13:04:44 +01:00
Joas Schilling
90a81a064b [ticket/11250] Add some comments and fix a description
PHPBB3-11250
2012-12-14 13:03:10 +01:00
Joas Schilling
deceeb7373 [ticket/11250] Add some more tests for quotes
PHPBB3-11250
2012-12-14 13:00:14 +01:00
Joas Schilling
ade9f831aa [ticket/11250] Move quote special cases from class to unit tests
PHPBB3-11250
2012-12-14 12:58:57 +01:00
Joas Schilling
754dc9c159 [ticket/11250] Add parsing tests for our basic bbcodes in simple cases
PHPBB3-11250
2012-12-14 12:56:42 +01:00
Nathan Guse
d739745ea4 [ticket/8610] Move posting helpers to separate file
This is to prevent cluttering up the functional test case class more

PHPBB3-8610
2012-12-13 23:09:45 -06:00
Nathan Guse
9eb9fa2b9d [ticket/8610] Create helper functions to create topic/post in functional tests
This will be used to test splitting/copying/merging/etc in functional tests

Also convert functional posting_test.php to use these functions

PHPBB3-8610
2012-12-13 22:38:17 -06:00
Nathan Guse
2469225a72 Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610
# By Oleg Pudeyev (29) and others
# Via Andreas Fischer (3) and others
* 'develop-olympus' of github.com:phpbb/phpbb3: (36 commits)
  [ticket/11262] Add .lock in cache directory to .gitignore
  [ticket/11265] Add assertions for board installation success.
  [ticket/11162] Reformat.
  [ticket/10491] Make recreate_database static.
  [ticket/11162] Rename tricky updates to database helper.
  [ticket/10491] Install board once per test run.
  [ticket/10972] Drop user deletion.
  [ticket/10972] Tweak user addition.
  [ticket/10972] Add destroy method to mock cache.
  [ticket/10972] Add mock null cache.
  [ticket/10972] Backport get_db from develop.
  [ticket/10972] Added explicit checks for creating duplicate users.
  [ticket/10972] Moved tests into appropriate places and added comments
  [ticket/10972] Added methods for creating and deleting basic users
  [ticket/11162] Use empty($queries).
  [ticket/11162] Review comments fixed.
  [ticket/11162] Reformat.
  [ticket/11162] Newlines to LF.
  [ticket/11162] Use correct functions.
  [ticket/11162] Account for notify_status.
  ...

Conflicts:
	phpBB/includes/mcp/mcp_topic.php
2012-12-13 20:46:25 -06:00
Nathan Guse
a50907250e [ticket/8610] Use phpbb_update_rows_avoiding_duplicates
PHPBB3-8610
2012-12-13 20:42:10 -06:00
Nathan Guse
5c614ff624 [ticket/8610] Revert some funky merging I did from rebase
PHPBB3-8610
2012-12-13 20:32:43 -06:00
Oleg Pudeyev
5e38317dcf [ticket/11162] Chase dbal autoloading changes in develop.
PHPBB3-11162
2012-12-13 21:27:30 -05:00
Nathan Guse
71bcc58fee [ticket/8610] Add some comments
PHPBB3-8610
2012-12-13 20:23:04 -06:00
Nathaniel Guse
5a88bd1bf1 [ticket/8610] Update Bookmarks and Subscriptions when splitting topics
Update bookmarks and subscriptions to add bookmarks/subscriptions to the
new topic when using the split_topic function

PHPBB3-8610
2012-12-13 20:23:03 -06:00
Nathaniel Guse
05d7decdd3 [ticket/8610] Update Bookmarks when merging posts into another topic
Update bookmarks to the new topic when merging posts into another topic
using the merge_posts function.

PHPBB3-8610
2012-12-13 20:19:27 -06:00
Nathaniel Guse
8dd2a151cc [ticket/8610] Update Bookmarks when forking topics
Update bookmarks to the new topic when forking topics using
the mcp_fork_topic function.

PHPBB3-8610
2012-12-13 20:19:26 -06:00
Nathaniel Guse
abcc59fca6 [ticket/8610] Update Bookmarks when merging topics
Update bookmarks to the new topic when merging multiple topics using
the merge_topics function.

PHPBB3-8610
2012-12-13 20:19:26 -06:00
Andreas Fischer
6e25b4231e Merge branch 'develop-olympus' into develop
* develop-olympus: (22 commits)
  [ticket/11162] Reformat.
  [ticket/11162] Rename tricky updates to database helper.
  [ticket/11162] Use empty($queries).
  [ticket/11162] Review comments fixed.
  [ticket/11162] Reformat.
  [ticket/11162] Newlines to LF.
  [ticket/11162] Use correct functions.
  [ticket/11162] Account for notify_status.
  [ticket/11162] This test really only works for bookmarks.
  [ticket/11162] The test is not at all trivial.
  [ticket/11162] Add includes.
  [ticket/11162] Move to a separate file to avoid blowing out functions.php.
  [ticket/11162] No whitespace changes in olympus.
  [ticket/11162] Fix inaccurately copy pasted comment.
  [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp.
  [ticket/11162] Clarify that only the two tables actually work.
  [ticket/11162] Uncomment transactions.
  [ticket/11162] An implementation that actually works.
  [ticket/11162] Make count function upper case.
  [ticket/11162] Rename count variable name to remaining_rows.
  ...
2012-12-14 02:56:20 +01:00
Andreas Fischer
f4df152b4b Merge remote-tracking branch 'p/ticket/11162' into develop-olympus
* p/ticket/11162: (22 commits)
  [ticket/11162] Reformat.
  [ticket/11162] Rename tricky updates to database helper.
  [ticket/11162] Use empty($queries).
  [ticket/11162] Review comments fixed.
  [ticket/11162] Reformat.
  [ticket/11162] Newlines to LF.
  [ticket/11162] Use correct functions.
  [ticket/11162] Account for notify_status.
  [ticket/11162] This test really only works for bookmarks.
  [ticket/11162] The test is not at all trivial.
  [ticket/11162] Add includes.
  [ticket/11162] Move to a separate file to avoid blowing out functions.php.
  [ticket/11162] No whitespace changes in olympus.
  [ticket/11162] Fix inaccurately copy pasted comment.
  [ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp.
  [ticket/11162] Clarify that only the two tables actually work.
  [ticket/11162] Uncomment transactions.
  [ticket/11162] An implementation that actually works.
  [ticket/11162] Make count function upper case.
  [ticket/11162] Rename count variable name to remaining_rows.
  ...
2012-12-14 02:55:07 +01:00