1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 13:04:24 +01:00

27337 Commits

Author SHA1 Message Date
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
Cesar G
a246cb6414 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14249] Fix online list order
2015-10-22 10:05:25 -07:00
Cesar G
5576c9f3b9 Merge pull request #3998 from Elsensee/ticket/14249
[ticket/14249] Fix online list order
2015-10-22 10:05:01 -07:00
Oliver Schramm
93208d597a [ticket/14249] Fix online list order
PHPBB3-14249
2015-10-21 21:51:43 +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
Tristan Darricau
326ba5325b Merge branch '3.1.x'
* 3.1.x:
  [ticket/9252] Do not try to disapprove a post that was just approved
2015-10-19 14:37:06 +02:00
Tristan Darricau
dfd5ec6835 Merge pull request #3666 from marc1706/ticket/9252
[ticket/9252] Do not try to disapprove a post that was just approved

* marc1706/ticket/9252:
  [ticket/9252] Do not try to disapprove a post that was just approved
2015-10-19 14:36:51 +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
d4dd112edf [ticket/14039] Include phpBB constants on startup
PHPBB3-14039
2015-10-18 18:56:11 +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
74ae7d2a8d [ticket/14039] Only show log container when it has content
PHPBB3-14039
2015-10-18 11:33:49 +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
Marc Alexander
b17fc98043 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_body.html
	phpBB/styles/subsilver2/template/memberlist_team.html
2015-10-18 10:33:05 +02:00
Marc Alexander
9ccb596a06 Merge pull request #3993 from DavidIQ/ticket/10343
[ticket/10343] Show clearer indication an account is inactive in memberlist
2015-10-18 10:32:41 +02:00
Máté Bartus
9781a55711 Merge pull request #3994 from prototech/ticket/14174
[ticket/14174] Refine wording of error descriptions in new installer.
2015-10-18 10:02:03 +02:00
DavidIQ
da9a5c70d5 [ticket/10343] Add inactive indicator to subsilver2 memberlist
PHPBB3-10343
2015-10-17 18:39:14 -04:00
DavidIQ
9a8393c912 [ticket/10343] Show clearer indication an account is inactive in memberlist
PHPBB3-10343
2015-10-17 18:38:53 -04:00
Cesar G
31350fb116 [ticket/14174] Refine wording of error descriptions in new installer.
PHPBB3-14174
2015-10-17 15:22:58 -07:00
Mate Bartus
8f5a0ad6f7 [ticket/14039] Revamp updater
PHPBB3-14039
2015-10-17 23:05:57 +02:00
Máté Bartus
f1047ac854 Merge pull request #3992 from Nicofuma/ticket/14243
[ticket/14243] Exclude every .git directory from the pakages
2015-10-17 18:55:45 +02:00
Tristan Darricau
d64accd72c [ticket/14243] Exclude every .git directory from the pakages
PHPBB3-14243
2015-10-17 18:50:14 +02:00
Máté Bartus
24e8a30993 Merge pull request #3991 from Nicofuma/ticket/14243
[ticket/14243] Exclude every .git directory from the pakages
2015-10-17 18:05:59 +02:00
Tristan Darricau
e9f262611d [ticket/14243] Exclude every .git directory from the pakages
PHPBB3-14243
2015-10-17 18:04:06 +02:00
Tristan Darricau
59d39dce3b Merge pull request #3986 from CHItA/ticket/14240
[ticket/14240] Fix packaging script for 3.2

* CHItA/ticket/14240:
  [ticket/14240] Fix packaging script for 3.2
2015-10-17 15:40:43 +02:00
Tristan Darricau
a928b109d3 Merge pull request #3990 from CHItA/ticket/13371
[ticket/13371] Fix language loading for the old installer

* CHItA/ticket/13371:
  [ticket/13371] Add language files to the service as well
  [ticket/13371] Use user selected language in old installer
  [ticket/13371] Fix language loading for the old installer
2015-10-17 15:36:19 +02:00
Mate Bartus
22b9f35bdf [ticket/13371] Add language files to the service as well
PHPBB3-13371
2015-10-17 15:02:09 +02:00
Mate Bartus
fb434adf88 [ticket/13371] Use user selected language in old installer
PHPBB3-13371
2015-10-17 14:55:14 +02:00
Mate Bartus
2efbf59f97 [ticket/13371] Fix language loading for the old installer
PHPBB3-13371
2015-10-17 14:51:40 +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
Marc Alexander
3a5336452c Merge pull request #3985 from prototech/ticket/13892
[ticket/13892] Respect "Someone reports a post" notification setting.
2015-10-17 12:06:27 +02:00