Commit graph

7143 commits

Author SHA1 Message Date
Nils Adermann
f817e20f28 [feature/migrations] Basic migrations with schema and data changes
The migrator takes care of applying migrations as necessary.

RFC: http://area51.phpbb.com/phpBB/viewtopic.php?f=84&t=41337

PHPBB3-9737
2013-01-09 16:39:59 -06:00
Marc Alexander
7402add107 [feature/avatars] Add missing @var to docblocks in avatar manager
PHPBB3-10018
2013-01-09 15:50:15 +01: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
Marc Alexander
cb08bf3c0c [feature/avatars] Strictly check if avatar list is empty and cache result
PHPBB3-10018
2013-01-08 21:46:43 +01:00
Marc Alexander
9e001153d6 [feature/avatars] Pass phpbb_user object to prepare_form_acp()
The phpbb_user object might be used for language variables. Pass it as a
function argument to prepare_form_acp() instead of using globals.

PHPBB3-10018
2013-01-08 15:42:30 +01:00
Marc Alexander
8778c9c945 [feature/avatars] Pass phpbb_user object to get_custom_html()
Pass the phpbb_user object to function get_custom_html(). This object is
used in that method. Also fixed incorrect arguments to get_custom_html()
in phpbb_get_avatar().

PHPBB3-10018
2013-01-08 15:34:20 +01:00
Marc Alexander
023d7a972d [feature/avatars] Remove $request property and pass as argument if needed
Remove the $request property from the phpbb_avatar_driver class and rather
pass it as function argument if it's needed in a function. Currently this
is only the case for the class methods prepare_form() and process_form().

PHPBB3-10018
2013-01-07 23:02:07 +01:00
Marc Alexander
8867cb60b1 [feature/avatars] Use empty() instead of sizeof()
PHPBB3-10018
2013-01-07 21:16:39 +01:00
Marc Alexander
41710c745d [feature/avatars] Add function for localizing errors
PHPBB3-10018
2013-01-06 21:09:07 +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
Marc Alexander
111e02395c [feature/avatars] Add missing docblocks to avatar manager
PHPBB3-10018
2013-01-05 20:17:53 +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
Marc Alexander
8f8527a416 [feature/avatars] Improve handling of incorrect input for avatars
The upload avatar driver will now inform the user if insufficient data has
been entered for both remote and local avatar uploads.
The local avatar driver (gallery avatar) will also inform the user if he
didn't select a category and/or file before submitting.

PHPBB3-10018
2013-01-04 17:32:04 +01:00
Marc Alexander
7256a2d944 [feature/avatars] Add phpbb prefix to new functions
Although get_user_avatar() is not new, the phpbb prefix was prepended. This
is due to the fact that it was entirely rewritten and is therefore more or
less a completely new function.

PHPBB3-10018
2013-01-04 15:10:43 +01:00
Marc Alexander
5d091e2d8f Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
	phpBB/includes/ucp/ucp_groups.php
2013-01-04 10:49:57 +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
Marc Alexander
8e756ad890 [feature/avatars] Let the server handle http or https for gravatars
PHPBB3-10018
2012-12-27 21:40:35 +01:00
Marc Alexander
6f41228752 [feature/avatars] Add missing explanation to docblock of get_all_drivers()
PHPBB3-10018
2012-12-27 20:46:07 +01:00
Marc Alexander
c865f98dcf [feature/avatars] Some more miscellaneous changes
PHPBB3-10018
2012-12-27 20:42:05 +01:00
Nathaniel Guse
192039a9e0 [ticket/11103] Fix sending the user ids to get the username/avatar
PHPBB3-11103
2012-12-27 10:31:43 -06:00
Nathaniel Guse
5a8520da62 [ticket/11103] Fix some more merging issues
PHPBB3-11103
2012-12-27 10:31:42 -06:00
Nathaniel Guse
bf93dceb1f [ticket/11103] Fix merge conflict
PHPBB3-11103
2012-12-26 11:09:03 -06: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
Marc Alexander
c9338b38b3 Merge branch 'develop' of github.com:marc1706/phpbb3 into feature/avatars 2012-12-24 14:34:10 +01: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