1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-04 21:44:57 +02:00

2655 Commits

Author SHA1 Message Date
Mate Bartus
369024b56f [ticket/14044] Try to fix missing table prefix
PHPBB3-14044
2015-10-28 00:58:34 +01:00
Marc Alexander
df53d40922 [ticket/14044] Automatically trigger rollback on insert in transaction
This will cause the sqlite3 driver to automatically rollback transactions
if an insert fails during a transaction. Other dbms trigger a rollback
inside the sql_error() function with a rollback command. However,
this manual rollback command might fail on sqlite3 due to ongoing queries.

With this change, sqlite3 itself will abort any ongoing queries and
initiate the rollback automatically. Since manually triggered rollbacks
will fail after the rollback was started automatically, we catch
exceptions output by the exec() command during rollback and any exception
that might be thrown by fetchArray() due to aborted queries.

PHPBB3-14044
2015-10-23 20:47:56 +02:00
Mate Bartus
d34d6378bc [ticket/14044] Use empty instead of !count
PHPBB3-14044
2015-10-23 13:25:00 +02:00
Marc Alexander
e0d06ee83e [ticket/14044] Fix Sqlite error in tests
PHPBB3-14044
2015-10-23 11:46:03 +02:00
Mate Bartus
597297b169 [ticket/14044] Deduplicate the installers
PHPBB3-14044
2015-10-22 21:29:52 +02:00
Mate Bartus
cc1a96a804 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13976] Fix comment typo in salted_md5.php
2015-10-21 00:32:20 +02:00
Máté Bartus
fa44e98e72 Merge pull request #3997 from CHItA/ticket/13976
[ticket/13976] Fix comment typo in salted_md5.php
2015-10-21 00:29:05 +02:00
Sumanai
6b433eab4c [ticket/13976] Fix comment typo in salted_md5.php
PHPBB3-13976
2015-10-21 00:22:42 +02:00
Tristan Darricau
5b3829aab4 Merge pull request #3794 from CHItA/ticket/14039
[ticket/14039] Refactoring the updater

* CHItA/ticket/14039:
  [ticket/14039] Use update helper to include files in container factory
  [ticket/14039] Fix inclusion logic in update helper
  [ticket/14039] Fix folder creation and deleted binary file issue
  [ticket/14039] Fix file check for deleted files
  [ticket/14039] Fix acp link
  [ticket/14039] Fix ACP link generation
  [ticket/14039] Fix constants for the updater
  [ticket/14039] Include phpBB constants on startup
  [ticket/14039] Fix migrator's language calls
  [ticket/14039] Fix misunderstandable comment in the archive file updater
  [ticket/14039] Use shared language service in the container factory
  [ticket/14039] Fix filesystem file updater's mkdir usage
  [ticket/14039] Only show log container when it has content
  [ticket/14039] Use compatibility globals from the update package
  [ticket/14039] Use http_exception instead of die()
  [ticket/14039] Fix T_TEMPLATE_PATH constant
  [ticket/14039] Fix language constants and comments
  [ticket/14039] Revamp updater
2015-10-19 14:43:48 +02:00
Tristan Darricau
9ea44abf38 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13799] Split lines in HTML files for better readability
  [ticket/13799] Add missing space before checked attribute
  [ticket/13799] Correctly urlencode category and show selected avatar
  [ticket/13799] Do not rawurlencode category in gallery avatar
2015-10-19 14:40:07 +02:00
Tristan Darricau
a6fd55db35 Merge pull request #3647 from marc1706/ticket/13799
[ticket/13799] Do not rawurlencode category in gallery avatar

* marc1706/ticket/13799:
  [ticket/13799] Split lines in HTML files for better readability
  [ticket/13799] Add missing space before checked attribute
  [ticket/13799] Correctly urlencode category and show selected avatar
  [ticket/13799] Do not rawurlencode category in gallery avatar
2015-10-19 14:39:14 +02:00
Mate Bartus
d45f146814 [ticket/14039] Use update helper to include files in container factory
PHPBB3-14039
2015-10-19 09:12:26 +02:00
Mate Bartus
de729110c8 [ticket/14039] Fix inclusion logic in update helper
PHPBB3-14039
2015-10-19 01:19:31 +02:00
Mate Bartus
2f8ef80d92 [ticket/14039] Fix folder creation and deleted binary file issue
PHPBB3-14039
2015-10-18 23:11:20 +02:00
Mate Bartus
4b447c71de [ticket/14039] Fix file check for deleted files
PHPBB3-14039
2015-10-18 23:04:53 +02:00
Mate Bartus
0ce72f94a2 [ticket/14039] Fix acp link
PHPBB3-14039
2015-10-18 22:33:31 +02:00
Mate Bartus
ed442198d1 [ticket/14039] Fix ACP link generation
PHPBB3-14039
2015-10-18 19:27:50 +02:00
Mate Bartus
56093d1c82 [ticket/14039] Fix constants for the updater
PHPBB3-14039
2015-10-18 19:18:53 +02:00
Mate Bartus
94bd35fd3b [ticket/14039] Fix migrator's language calls
PHPBB3-14039
2015-10-18 18:28:12 +02:00
Mate Bartus
3b593c5d52 [ticket/14039] Fix misunderstandable comment in the archive file updater
PHPBB3-14039
2015-10-18 18:17:28 +02:00
Mate Bartus
29908e54bc [ticket/14039] Use shared language service in the container factory
PHPBB3-14039
2015-10-18 17:31:12 +02:00
Mate Bartus
dd85806327 [ticket/14039] Fix filesystem file updater's mkdir usage
PHPBB3-14039
2015-10-18 14:00:53 +02:00
Mate Bartus
6b561b9eae [ticket/14039] Use compatibility globals from the update package
PHPBB3-14039
2015-10-18 11:30:09 +02:00
Mate Bartus
100bb8f27c [ticket/14039] Use http_exception instead of die()
PHPBB3-14039
2015-10-18 11:26:41 +02:00
Mate Bartus
afe91fa7d3 [ticket/14039] Fix T_TEMPLATE_PATH constant
PHPBB3-14039
2015-10-18 11:22:19 +02:00
Mate Bartus
85eb6a0bc0 [ticket/14039] Fix language constants and comments
PHPBB3-14039
2015-10-18 11:21:56 +02:00
Mate Bartus
8f5a0ad6f7 [ticket/14039] Revamp updater
PHPBB3-14039
2015-10-17 23:05:57 +02:00
Marc Alexander
7d4bbeef3f Merge branch '3.1.x'
Conflicts:
	phpBB/phpbb/notification/type/bookmark.php
	phpBB/phpbb/notification/type/post.php
	phpBB/phpbb/notification/type/quote.php
2015-10-17 12:13:32 +02:00
Cesar G
aaca64e13e [ticket/13892] Replace other uses of self with static.
PHPBB3-13892
2015-10-15 02:39:55 -07:00
Cesar G
9de5668b80 [ticket/13892] Respect "Someone reports a post" notification setting.
report_post inherits from post_in_queue, therefore using self:: instead of
static:: results in the incorrect notification type being used to determine
which users to exclude from the notification.

PHPBB3-13892
2015-10-15 02:28:55 -07:00
Cesar G
90038e32cd [ticket/13789] Upgrade reCaptcha plugin to 2.0 API.
PHPBB3-13789
2015-10-14 19:05:27 -07:00
Tristan Darricau
84150d0d44 [ticket/13652] Fix coding style
PHPBB3-13652
2015-10-14 17:15:09 +02:00
Tristan Darricau
cd114a68e9 Merge pull request #3441 from brunoais/feature/sql-bool-builder
[feature/sql-bool-builder] Extending DBAL query builder for boolean generation

* brunoais/feature/sql-bool-builder:
  [feature/sql-bool-builder] Improved tests output to show the SQL error.
  [feature/sql-bool-builder] Adding the IS operator to predicted operators
  [feature/sql-bool-builder] test_single_not_like
  [feature/sql-bool-builder] test_single_like
  [feature/sql-bool-builder] test_single_not_in
  [feature/sql-bool-builder] test_single_in
  [feature/sql-bool-builder] test_and_of_or_of_and
  [feature/sql-bool-builder] test_triple_and_with_in
  [feature/sql-bool-builder] test_double_and_with_not_of_and
  [feature/sql-bool-builder] test_triple_and_with_is_null
  [feature/sql-bool-builder] Prepare testing class
  [feature/sql-bool-builder] Added LIKE and NOT_LIKE to the comparations
  [feature/sql-bool-builder] Explain better the code in the first
  [feature/sql-bool-builder] Also use parenthesis for the NOT operator
  [feature/sql-bool-builder] AS keyword must be lowercase;
  [feature/sql-bool-builder] Added code to use this feature for the WHERE clause
  [feature/sql-bool-builder] Removed non-necessary spaces
  [feature/sql-bool-builder] First working version
2015-10-14 16:18:46 +02:00
Tristan Darricau
cac090b659 Merge pull request #3913 from marc1706/ticket/14168
[ticket/14168] Refactor attachment management functions into classes

* marc1706/ticket/14168: (36 commits)
  [ticket/14168] Correctly state return type of upload and upload_attachment
  [ticket/14168] Use attachment manager instead of separate classes
  [ticket/14168] Fix docblock in manager
  [ticket/14168] Add more test cases for attachment manager
  [ticket/14168] Add new test method and more tests
  [ticket/14168] Fix tabs in manager and add test file
  [ticket/14168] Fix tests after rebase
  [ticket/14168] Add attachment manager service
  [ticket/14168] Use correct docblock
  [ticket/14168] Add services_attachment.yml to services.yml
  [ticket/14168] Minor coding style fixes
  [ticket/14168] Move attachment service definitions to services_attachment
  [ticket/14168] Improve code coverage in upload class
  [ticket/14168] Move image check and don't use trigger_error()
  [ticket/14168] Add tests for init_error() during upload
  [ticket/14168] Add basic test file for attachments upload
  [ticket/14168] Fix CS issue
  [ticket/14168] No longer use deprecated functions in core files
  [ticket/14168] Move phpbb_unlink() into attachment delete class
  [ticket/14168] Reset sequence before tests in delete tests
  ...
2015-10-14 08:40:01 +02:00
Tristan Darricau
359ef56e35 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13835] Normalize filename for attachments uploaded in chunks.
2015-10-14 08:38:32 +02:00
Cesar G
655f244c4f [ticket/13835] Normalize filename for attachments uploaded in chunks.
PHPBB3-13835
2015-10-13 20:17:26 -07:00
Tristan Darricau
a5ab2eb564 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14098] Add core events to the search backends
2015-10-12 13:38:42 +02:00
Tristan Darricau
1164cc38a2 Merge pull request #3830 from rxu/ticket/14098
[ticket/14098] Add core events to the search backends

* rxu/ticket/14098:
  [ticket/14098] Add core events to the search backends
2015-10-12 13:38:42 +02:00
Marc Alexander
bb2634b5e5 [ticket/14168] Correctly state return type of upload and upload_attachment
PHPBB3-14168
2015-10-12 12:11:26 +02:00
Tristan Darricau
af1597ae25 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14191] Add core.get_gravatar_url_after event
2015-10-12 11:32:05 +02:00
Tristan Darricau
65b13938db Merge pull request #3925 from Senky/ticket/14191
[ticket/14191] Add core.get_gravatar_url_after event

* Senky/ticket/14191:
  [ticket/14191] Add core.get_gravatar_url_after event
2015-10-12 11:32:05 +02:00
Marc Alexander
8c3fdfe4e1 Merge branch '3.1.x' 2015-10-11 10:48:53 +02:00
Marc Alexander
f6c8338358 Merge pull request #3864 from Zoddo/ticket/8920
[ticket/8920] Add a MCP PM reports view permission
2015-10-11 10:47:44 +02:00
Marc Alexander
f6f796770a Merge pull request #3903 from Zoddo/ticket/13101
[ticket/13101] Remove MSN/WLM custom profile field
2015-10-10 20:52:52 +02:00
Marc Alexander
d1b7101fed Merge pull request #3896 from Zoddo/ticket/14157
[ticket/14157] Allow to set the alt/title attribute on post icons
2015-10-10 16:43:15 +02:00
Zoddo
3937f1f4ae [ticket/14157] Allow to set the alt/title attribute on post icons
PHPBB3-14157
2015-10-10 15:29:31 +02:00
Zoddo
21201aa1ab [ticket/13101] Remove existing MSN/WLM custom profile field
PHPBB3-13101
2015-10-10 15:24:22 +02:00
rxu
d75750fd99 [ticket/14098] Add core events to the search backends
PHPBB3-14098
2015-10-09 23:06:16 +07:00
Marc Alexander
a0167ad410 [ticket/14168] Fix docblock in manager
PHPBB3-14168
2015-10-09 14:35:40 +02:00
Marc Alexander
53008c8782 [ticket/14168] Fix tabs in manager and add test file
PHPBB3-14168
2015-10-09 12:14:19 +02:00