1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-29 10:39:19 +02:00

6570 Commits

Author SHA1 Message Date
Nathan Guse
a2f6e494f3 Merge remote-tracking branch 'remotes/brunoais/ticket/11171' into develop
# By Bruno Ais
# Via Bruno Ais
* remotes/brunoais/ticket/11171:
  [ticket/11171] Moved the DB schema changes to its place
  [ticket/11171] Cleanup of leftovers
  [ticket/11171] Adapted the code in report.php
  [ticket/11171] Use the options stored to decide how to show it
  [ticket/11171] DB changes for the update
  [ticket/11171] DB additions for these changes

Conflicts:
	phpBB/install/schemas/firebird_schema.sql
	phpBB/install/schemas/mssql_schema.sql
	phpBB/install/schemas/mysql_40_schema.sql
	phpBB/install/schemas/mysql_41_schema.sql
	phpBB/install/schemas/oracle_schema.sql
	phpBB/install/schemas/postgres_schema.sql
	phpBB/install/schemas/sqlite_schema.sql
2013-01-14 12:16:59 -06:00
Oleg Pudeyev
0e9b7bcae9 Merge PR #1182 branch 'develop-olympus' into develop
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
  [ticket/11301] Guidelines: Add spaces in front and after the / operator.
  [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
2013-01-09 01:25:54 -05:00
Andreas Fischer
41a07eedeb [ticket/11301] Guidelines: Add spaces in front and after the / operator.
PHPBB3-11301
2013-01-08 23:20:30 +01:00
Andreas Fischer
24befac7b4 [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
PHPBB3-11301
2013-01-08 23:18:17 +01:00
Andreas Fischer
ef8cc04dc8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11292] Fix: Newlines removed in display of PM reports
2013-01-06 02:12:25 +01:00
Andreas Fischer
c8dd12e5f4 Merge remote-tracking branch 'gn36/ticket/11292' into develop-olympus
* gn36/ticket/11292:
  [ticket/11292] Fix: Newlines removed in display of PM reports
2013-01-06 02:11:10 +01:00
Erik Frèrejean
68baee4ce2 [ticket/11309] phpbb_extension_interface::disable_step correct docblock.
The `@return` documentation of the `phpbb_extension_interface::disable_step`
method states incorrect that the method returns null, as it returns
false or a state.

PHPBB3-11309
2013-01-04 23:59:34 +01:00
Andreas Fischer
228580b674 Merge remote-tracking branch 'erikfrerejean/ticket/11283' into develop
* erikfrerejean/ticket/11283:
  [ticket/11283] Extension manager follow symlinks.
2013-01-03 04:10:04 +01:00
Oleg Pudeyev
c8c6eb46ec [ticket/11305] Check for $cache being null before using it in db drivers.
There is no reason why db drivers must have a cache to work.
They query the database, that part works without caches.

PHPBB3-11305
2013-01-02 14:36:14 -05:00
Oleg Pudeyev
b94f9ae302 [ticket/11305] Retrieve cache driver from container rather than cache service.
This only covers some of the call sites.

PHPBB3-11305
2013-01-02 01:29:32 -05:00
Oleg Pudeyev
7adae349a9 [ticket/11305] Extract hook finder from cache service.
Unlike most other things in cache service, hook finder does not need
a database connection.

PHPBB3-11305
2013-01-02 01:29:32 -05:00
Igor Wiedler
21eb8d842b [ticket/11306] Add docblocks to all container related functions
PHPBB3-11306
2013-01-02 06:41:40 +01:00
Igor Wiedler
ea24de8de3 [ticket/11306] Introduce phpbb_create_default_container
Extracts default container construction to factory function, removing
boilerplate duplication for container construction.

PHPBB3-11306
2013-01-02 06:41:35 +01:00
Andreas Fischer
53c4257bfa Merge remote-tracking branch 'p/ticket/11037' into develop
* p/ticket/11037:
  [ticket/11037] Fix unit tests.
  [ticket/11037] Update services.yml.
  [ticket/11037] Add/update docblocks.
  [ticket/11037] Eliminate globals from cache service.
2012-12-31 01:11:19 +01:00
Andreas Fischer
01227cdca5 Merge remote-tracking branch 'p/ticket/11188' into develop
* p/ticket/11188:
  [ticket/11188] Reduce waste.
  [ticket/11188] add result count query for author search
  [ticket/11188] add count query to postgres search
2012-12-31 00:56:15 +01:00
Andreas Fischer
3a0e98a3bd Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11293] Add a note that mysqli should be in front of mysql.
2012-12-31 00:54:31 +01:00
Oleg Pudeyev
3d27ed13f5 [ticket/11188] Reduce waste.
PHPBB3-11188
2012-12-30 18:50:09 -05:00
Dhruv
763f2929ba [ticket/11188] add result count query for author search
PHPBB3-11188
2012-12-30 18:50:09 -05:00
Dhruv
979edc4113 [ticket/11188] add count query to postgres search
PHPBB3-11188
2012-12-30 18:50:05 -05:00
Oleg Pudeyev
4dcc8cabae Merge PR #1130 branch 'EXreaction/ticket/11259' into develop
* EXreaction/ticket/11259:
  [ticket/11259] htmlspecialchars($phpbb_admin_path)
  [ticket/11259] adm_relative_path -> phpbb_adm_relative_path
  [ticket/11259] Also make adm_relative_path available in the container
  [ticket/11259] Make phpbb_admin_path available everywhere

Conflicts:
	phpBB/install/index.php
	phpBB/install/install_update.php
2012-12-29 13:45:40 -05:00
Oleg Pudeyev
bad7661ee9 [ticket/11037] Add/update docblocks.
PHPBB3-11037
2012-12-26 10:47:03 -05:00
Andreas Fischer
cb7f6deb07 Merge remote-tracking branch 'p/ticket/10758' into develop
* p/ticket/10758:
  [ticket/10758] Add return to the other compat function.
  [ticket/10758] Add periods.
  [ticket/10758] Yes, only one empty line.
  [ticket/10758] Add deprecated tags.
  [ticket/10758] Add compat functions.
  [ticket/10758] Admin is not working yet.
  [ticket/10758] Test moderator and admin permissions.
  [ticket/10758] Check that acl was changed in the test.
  [ticket/10758] Extract obtain_user_data for the benefit of tests.
  [ticket/10758] Functional test for changing a user's permission.
  [ticket/10758] Spelling fix.
  [ticket/10758] Add a test for acp login.
  [ticket/10758] Dependency inject parameters into update_foes.
  [ticket/10758] Dependency inject parameters into cache_moderators.
2012-12-25 15:18:47 +01:00
Oleg Pudeyev
989c4c3e64 [ticket/11293] Add a note that mysqli should be in front of mysql.
php 5.5 alpha 2 deprecated mysql extension, prefer mysqli if
both are available.

PHPBB3-11293
2012-12-25 00:11:34 -05:00
Oleg Pudeyev
0b47a7823a [ticket/11037] Eliminate globals from cache service.
PHPBB3-11037
2012-12-24 15:36:43 -05:00
Oleg Pudeyev
8707a34135 [ticket/10758] Add return to the other compat function.
PHPBB3-10758
2012-12-24 15:12:57 -05:00
Martin Beckmann
5056f16235 [ticket/11292] Fix: Newlines removed in display of PM reports
Report text is run through make_clickable and bbcode_nl2br for PMs
just as it is for posts.

PHPBB3-11292
2012-12-24 04:16:08 +01:00
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
496529fa71 [ticket/10758] Add periods.
PHPBB3-10758
2012-12-22 17:54:54 -05:00
Oleg Pudeyev
aaaf8a5332 [ticket/10758] Yes, only one empty line.
PHPBB3-10758
2012-12-22 17:40:25 -05:00
Andreas Fischer
7f0fa6477f Merge remote-tracking branch 'p/ticket/11248' into develop
* p/ticket/11248:
  [ticket/11248] Convert line endings to LF - develop edition.
2012-12-22 23:25:54 +01:00
Andreas Fischer
4b808e2671 Merge remote-tracking branch 'p/ticket/11037' into develop
* p/ticket/11037:
  [ticket/11037] Eliminate global $db usage in cache drivers.
2012-12-22 23:21:19 +01:00
Andreas Fischer
3fefa5bb13 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10880] The m_approve permisson no longer implies f_noapprove.

Conflicts:
	phpBB/posting.php
2012-12-20 14:28:01 +01:00
Oleg Pudeyev
5c81728983 [ticket/10758] Add deprecated tags.
PHPBB3-10758
2012-12-20 05:10:57 -05:00
Oleg Pudeyev
e50f69187f [ticket/11037] Eliminate global $db usage in cache drivers.
The only time $db is needed in cache drivers is to navigate the
result set in sql_save. Pass it as a parameter in that function.

PHPBB3-11037
2012-12-20 04:35:30 -05:00
Oleg Pudeyev
69e373c1af [ticket/10758] Add compat functions.
PHPBB3-10758
2012-12-20 00:00:15 -05:00
Andreas Fischer
917a2fa9a6 [ticket/10880] The m_approve permisson no longer implies f_noapprove.
PHPBB3-10880
2012-12-19 22:02:39 -05:00
Oleg Pudeyev
9a1df948c6 [ticket/10758] Extract obtain_user_data for the benefit of tests.
PHPBB3-10758
2012-12-19 21:50:35 -05: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
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
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
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
Nathan Guse
649e009f7b [ticket/8610] Update comment
PHPBB3-8610
2012-12-15 16:23:48 -06:00
Oleg Pudeyev
9e7d663e76 [ticket/10758] Spelling fix.
PHPBB3-10758
2012-12-15 16:50:28 -05:00
Oleg Pudeyev
e82833d4b8 [ticket/10758] Dependency inject parameters into update_foes.
Also add phpbb prefix since the signature is being changed anyway.

PHPBB3-10758
2012-12-15 16:50:28 -05:00
Oleg Pudeyev
5c496674f6 [ticket/10758] Dependency inject parameters into cache_moderators.
Also add phpbb prefix since the signature is being changed anyway.

PHPBB3-10758
2012-12-15 16:50:28 -05: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
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