1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-12 23:44:32 +02:00
Commit Graph

13524 Commits

Author SHA1 Message Date
Oleg Pudeyev
21caf6db6f Merge PR #545 branch 'brunoais/ticket/10601' into develop
* brunoais/ticket/10601:
  [ticket/10601] The ORDER BY is only taking space there
  [ticket/10601] New approach in the update algorithm
  [ticket/10601] Comment to help understanding the code
  [ticket/10601] Requested code changes
  [ticket/10601] Cosmetic code changes
  [ticket/10601] Database updating code v2
  [ticket/10601] Database updating code
  [ticket/10601] Comment explaning the basename applied to categories
  [ticket/10601] Correctly access class property
  [ticket/10601]Move Inbox the default in private messages module
2012-12-01 15:09:38 -05:00
Oleg Pudeyev
ab6c284ddd Merge PR #1095 branch 'nickvergessen/ticket/11209' into develop
* nickvergessen/ticket/11209:
  [ticket/11209] Clone disable moving images to allow multiple per page
2012-12-01 06:21:09 -05:00
Andreas Fischer
1ceb1f759d Merge remote-tracking branch 'p/ticket/11227' into develop
* p/ticket/11227:
  [ticket/11227] @return void -> @return null in code sniffer.
  [ticket/11227] @return void -> @return null, per coding guidelines.
2012-12-01 12:21:29 +01:00
Bruno Ais
1ce0671181 [ticket/10601] The ORDER BY is only taking space there
PHPBB3-10601
2012-12-01 10:05:20 +00:00
Oleg Pudeyev
7a77edf25e Merge PR #893 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10184] Query bots table to get the user_ids of the bots
  [ticket/10184] Disable receiving pms for bots by default
2012-12-01 04:55:48 -05:00
Oleg Pudeyev
ae14ac7ba9 Merge PR #893 branch 'nickvergessen/ticket/10184' into develop-olympus
* nickvergessen/ticket/10184:
  [ticket/10184] Query bots table to get the user_ids of the bots
  [ticket/10184] Disable receiving pms for bots by default
2012-12-01 04:55:00 -05:00
Joas Schilling
ad2d560f3f [ticket/10184] Query bots table to get the user_ids of the bots
PHPBB3-10184
2012-12-01 10:54:26 +01:00
Joas Schilling
314462d835 [ticket/10184] Disable receiving pms for bots by default
PHPBB3-10184
2012-12-01 10:54:16 +01:00
Bruno Ais
a0d5c52eb6 [ticket/10601] New approach in the update algorithm
- New approach in the database update algorithm

PHPBB3-10601
2012-12-01 09:44:51 +00:00
Oleg Pudeyev
ec4343c744 [ticket/11227] @return void -> @return null, per coding guidelines.
PHPBB3-11227
2012-11-30 23:03:06 -05:00
Oleg Pudeyev
3a702084e4 Merge PR #974 branch 'bantu/ticket/10875' into develop
* bantu/ticket/10875:
  [ticket/10875] tests/cache/cache_test.php: Use single quotes where possible.
  [ticket/10875] Test for null cache driver and sql cache.
  [ticket/10875] Revise sql cache test.
  [ticket/10875] Must return query result on failure.
  [ticket/10875] More documentation.
  [ticket/10875] Spelling fix.
  [ticket/10875] Add docblocks for phpbb_cache_driver_interface
  [ticket/10875] Add comment about cache's sql_load() method.
  [ticket/10875] Fix logic in phpbb_cache_driver_file::sql_save().
  [ticket/10875] Fix phpbb_mock_cache::sql_save() to return $query_result.
  [ticket/10875] Fix return value of phpbb_cache_driver_null::sql_save().
  [ticket/10875] Remove useless assignment from phpbb_cache_driver_memory.
2012-11-30 20:44:51 -05:00
Oleg Pudeyev
1ebc6eb68b [ticket/10875] Must return query result on failure.
PHPBB3-10875
2012-11-30 12:11:52 -05:00
Oleg Pudeyev
3eb15ab59e [ticket/10875] More documentation.
PHPBB3-10875
2012-11-30 12:04:05 -05:00
Oleg Pudeyev
ee16ed7b76 [ticket/10875] Spelling fix.
PHPBB3-10875
2012-11-30 11:55:13 -05:00
Andreas Fischer
5d78346453 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11227] @return void -> @return null in develop-olympus.
2012-11-29 23:17:58 +01:00
Oleg Pudeyev
65253a3023 [ticket/11227] @return void -> @return null in develop-olympus.
PHPBB3-11227
2012-11-29 15:37:12 -05:00
Bruno Ais
1d98915881 [ticket/10601] Comment to help understanding the code
PHPBB3-10601
2012-11-28 19:37:16 +00:00
Bruno Ais
a4cc076177 [ticket/10601] Requested code changes
- Renamed the comment to PHPBB3-10601
- Removed backslashes
- Traded double quotes into single quotes inside.

PHPBB3-10601
2012-11-28 19:36:13 +00:00
Dhruv
c725b02df8 [ticket/11174] include utf_tools in postgres search backend
PHPBB3-11174
2012-11-27 08:49:06 -05:00
Dhruv
6e8f142d39 [ticket/11174] removes unnecessary space from word
PHPBB3-11174
2012-11-27 08:48:15 -05:00
Dhruv
764da97772 [ticket/11174] include utf_tools in mysql backend
when running tests include utf_tools file in the mysql search backend

PHPBB3-11174
2012-11-27 08:48:06 -05:00
Bruno Ais
1f9eaa1c56 [ticket/10601] Cosmetic code changes
- Removed the double line before the addition
- Moved the condition of the WHERE so that both are in the same line
- Removed TABs from the black lines
- Used double quotes instead of escaped single quotes.

PHPBB3-10601
2012-11-26 17:45:46 +00:00
Bruno Ais
85ebbbaec4 [ticket/10601] Database updating code v2
Added the space after the (int) as requested

PHPBB3-10601
2012-11-26 17:45:31 +00:00
Bruno Ais
80da19ca7c [ticket/10601] Database updating code
This is what is needed to update the database to comply with these code changes

PHPBB3-10601
2012-11-26 17:45:18 +00:00
Bruno Ais
81547ba980 [ticket/10601] Comment explaning the basename applied to categories
Explain in the code where
 if (isset($this->module_categories_basenames[$cat_name]))
and
if (isset($this->module_categories_basenames[$level2_name]))
exists, what does it do.

PHPBB3-10601
2012-11-26 17:45:06 +00:00
David King
61842c317a [ticket/10601] Correctly access class property
PHPBB3-10601
2012-11-26 17:44:54 +00:00
Bruno Ais
24939c8225 [ticket/10601]Move Inbox the default in private messages module
Did exactly as the answer here asked:
http://area51.phpbb.com/phpBB/viewtopic.php?p=234111

PHPBB3-10601
2012-11-26 17:44:41 +00:00
Igor Wiedler
b453f359ff Merge remote-tracking branch 'imkingdavid/feature/controller-new' into develop
* imkingdavid/feature/controller-new: (67 commits)
  [feature/controller] Fix misnamed route for functional test
  [feature/controller] Fix comments, check against more general HttpException
  [feature/controller] Check for proper status codes from controllers
  [feature/controller] Correctly create Symfony object from globals
  [feature/controller] Add documentation about input being HTML-escaped
  [feature/controller] Create Symfony Request in new function
  [feature/controller] Remove unused language strings
  [feature/controller] Don't use $user->lang() before container compilation
  [feature/controller] Update routing documentation for using query string
  [feature/controller] Remove now-unused code
  [feature/controller] Remove url rewriting until we use pathinfo in controllers
  [feature/controller] Fix functional tests to use query string for controllers
  [feature/controller] Allow injecting Symfony Request into controllers
  [feature/controller] Use query string, not path info, for controller access
  [feature/controller] Fix line endings and permissions, and check responses
  [feature/controller] Remove URL rewriting by default
  [feature/controller] Add controller functional test with template
  [feature/controller] Use warning instead of echo for copy() and unlink()
  [feature/controller] Flip method parameters, require $message
  [feature/controller] Rename $root_path class property to $phpbb_root_path
  ...
2012-11-19 22:28:12 +01:00
David King
01ec608593 [feature/controller] Fix comments, check against more general HttpException
PHPBB3-10864
2012-11-19 12:55:15 -05:00
David King
f8614bfc84 [feature/controller] Check for proper status codes from controllers
PHPBB3-10864
2012-11-19 12:37:20 -05:00
David King
3004350281 [feature/controller] Correctly create Symfony object from globals
PHPBB3-10864
2012-11-19 11:47:42 -05:00
David King
e2bf66d065 [feature/controller] Add documentation about input being HTML-escaped
PHPBB3-10864
2012-11-18 15:58:47 -05:00
David King
0f4f81b096 [feature/controller] Create Symfony Request in new function
PHPBB3-10864
2012-11-18 15:52:35 -05:00
David King
2f50d65648 [feature/controller] Remove unused language strings
PHPBB3-10864
2012-11-18 15:51:32 -05:00
David King
60c0a1dd2a [feature/controller] Don't use $user->lang() before container compilation
PHPBB3-10864
2012-11-18 15:51:05 -05:00
David King
50a96a2a2d [feature/controller] Update routing documentation for using query string
PHPBB3-10864
2012-11-18 13:40:24 -05:00
David King
53caf83233 [feature/controller] Remove now-unused code
PHPBB3-10864
2012-11-18 13:35:04 -05:00
David King
09d7367dfc [feature/controller] Remove url rewriting until we use pathinfo in controllers
PHPBB3-10864
2012-11-18 13:32:54 -05:00
Oleg Pudeyev
f4fedfe95b Merge PR #1098 branch 'igorw/ticket/11213' into develop
* igorw/ticket/11213:
  [ticket/11213] Add missing global in install_update.php
2012-11-18 10:20:59 -05:00
David King
4d6f6351dd [feature/controller] Allow injecting Symfony Request into controllers
PHPBB3-10864
2012-11-17 18:05:32 -05:00
David King
8913b2c7c4 [feature/controller] Use query string, not path info, for controller access
This is hopefully just temporary until we can fix the relative path issue.

PHPBB3-10864
2012-11-17 17:48:20 -05:00
Igor Wiedler
b5e069f879 Merge remote-tracking branch 'p/ticket/10933' into develop
* p/ticket/10933:
  [ticket/10933] Prose for get_first_file_location.
  [ticket/10933] Remaining documentation for added functions in resource locator
  [ticket/10933] Update template locator test to use style resource locator.
  [ticket/10933] Dispose of locate function in template class.
  [ticket/10933] Add mutators for template_path to style resource locator.
  [ticket/10933] Delete template_path assignment.
  [ticket/10933] Delete template_path from template class.
  [ticket/10933] Add get_first_template_location.
2012-11-17 19:49:03 +01:00
Igor Wiedler
b8cf74217a [ticket/11212] Cosmetic surgery done right
PHPBB3-11212
2012-11-17 05:29:49 +01:00
Igor Wiedler
1affc35be9 [ticket/11212] Cosmetics
PHPBB3-11212
2012-11-17 05:29:49 +01:00
Igor Wiedler
b534a7a579 [ticket/11212] Rename get_http_version to phpbb_request_http_version()
PHPBB3-11212
2012-11-17 05:29:49 +01:00
Igor Wiedler
98921e0b87 [ticket/11213] Add missing global in install_update.php
PHPBB3-11213
2012-11-17 05:27:36 +01:00
Igor Wiedler
9cdef7984f [ticket/11212] Allow dispatcher to be absent during garbage_collection()
PHPBB3-11212
2012-11-17 01:17:23 +01:00
Igor Wiedler
5fad4006e1 [ticket/11212] Do not rely on $request in send_status_line()
PHPBB3-11212
2012-11-17 01:15:50 +01:00
David King
abf2575bdb [feature/controller] Remove URL rewriting by default
PHPBB3-10864
2012-11-16 17:06:02 -05:00
David King
1952a4f276 [feature/controller] Flip method parameters, require $message
PHPBB3-10864
2012-11-16 17:06:00 -05:00