Commit graph

14958 commits

Author SHA1 Message Date
Igor Wiedler
73ce1a5a97 [ticket/11199] Purge dumped container correctly on cache purge.
This patch changes the dumped container suffix to a prefix instead which
makes the existing code for purging 'cache/container_*' files work
as intended.

PHPBB3-11199
2012-11-15 01:56:33 +01:00
Igor Wiedler
56b7ba2085 Merge remote-tracking branch 'p/ticket/11199' into develop
* p/ticket/11199:
  [ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
2012-11-15 01:13:30 +01:00
Oleg Pudeyev
30e9d2d600 [ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
This reverts commit 303fc646ad, reversing
changes made to 9c28470ad7.

The correct fix should be to alter the container file name to start with
container_ prefix.

PHPBB3-11199
2012-11-14 19:07:28 -05:00
David King
303fc646ad Merge remote-tracking branch 'marc1706/ticket/11199' into develop
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/11199:
  [ticket/11199] Cache purge does not remove dumped container
2012-11-14 18:54:06 -05:00
Marc Alexander
d982d432eb [ticket/11199] Cache purge does not remove dumped container
PHPBB3-11199
2012-11-14 23:34:28 +01:00
Joas Schilling
e39947e57e [ticket/11198] Store the swapping partners in vars and simplify the logic
PHPBB3-11198
2012-11-14 23:30:29 +01:00
Joas Schilling
857298e748 [ticket/11198] Correctly set links after an item is moved up/down with AJAX
PHPBB3-11198
2012-11-14 16:31:46 +01:00
Igor Wiedler
831d5ad505 [ticket/10875] Add docblocks for phpbb_cache_driver_interface
PHPBB3-10875
2012-11-14 14:10:35 +01:00
Andreas Fischer
9c28470ad7 Merge remote-tracking branch 'marc1706/ticket/11197' into develop
* marc1706/ticket/11197:
  [ticket/11197] Prefix the css classes for the small arrow with "arrow"
2012-11-13 21:35:33 +01:00
Marc Alexander
5f15c98c1d [ticket/11197] Prefix the css classes for the small arrow with "arrow"
It does not make sense to have classes named "right" and "left" produce a
small arrow next to text. It should be made clear that an arrow will
appear.

PHPBB3-11197
2012-11-13 20:57:34 +01:00
Andreas Fischer
607865d97a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10879] Remove arrow icon from attachment link in editor
2012-11-13 20:36:18 +01:00
Andreas Fischer
8b156c3d83 Merge remote-tracking branch 'marc1706/ticket/10879' into develop-olympus
* marc1706/ticket/10879:
  [ticket/10879] Remove arrow icon from attachment link in editor
2012-11-13 20:35:50 +01:00
Marc Alexander
170967c48a [ticket/10879] Remove arrow icon from attachment link in editor
If you upload a file with a long filename the filename will partially
cover the arrow icon background image. Remove the icon as it's not needed
anyways.

PHPBB3-10879
2012-11-13 20:26:49 +01:00
Igor Wiedler
904b2f5d7f Merge remote-tracking branch 'imkingdavid/ticket/11195' into develop
* imkingdavid/ticket/11195:
  [ticket/11195] Condense logic, remove improperly formatted if()
2012-11-12 22:26:36 +01:00
David King
d33aaac199 [ticket/11195] Condense logic, remove improperly formatted if()
PHPBB3-11195
2012-11-12 16:16:40 -05:00
Igor Wiedler
0fd3bb170b [ticket/11015] Fixup some things from the big merge
PHPBB3-11015
2012-11-12 11:16:39 +01:00
Igor Wiedler
bf641a7f31 Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (31 commits)
  [ticket/11194] Service tag data is stored in an array so access it correctly
  [ticket/11193] Instantiate a single collection_pass for all collections
  [ticket/11152] Basic tests for the container functions
  [ticket/11152] Compile the install container
  [ticket/11152] Throw error if services.yml is missing
  [ticket/11152] Remove old container processor calls
  [ticket/11152] Use realpath in container extensions consistently
  [ticket/11152] Rename collection to collection_pass
  [ticket/11152] Remove @api docblocks
  [ticket/11152] Create separate function for debug-dependent container
  [ticket/11152] Change phpbb_di_pass_cron to generic phpbb_di_pass_collection
  [ticket/11152] Convert cron_task_collection to generic di_service_collection
  [ticket/11152] Use relative root path in container, one dumped container per path
  [ticket/11152] Move container functions to a separate function file
  [feature/compiled-dic] Rename $phpEx to $php_ext in new code
  [feature/compiled-dic] Use an absolute path for core.root_path parameter
  [feature/compiled-dic] Update the composer.lock file
  [feature/compiled-dic] Purge cache to make ext services available right away
  [feature/compiled-dic] Fix root path when container is created after install
  [feature/compiled-dic] Remove old test
  ...
2012-11-12 10:46:21 +01:00
Igor Wiedler
9bc9ac281a [ticket/11015] Remove old dbal classes
PHPBB3-11015
2012-11-12 10:38:28 +01:00
Igor Wiedler
5e52216b5e Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (666 commits)
  [ticket/11077] Remove code from old global announcements system
  [ticket/11189] Replace DEBUG_EXTRA with DEBUG
  [ticket/11189] Always log critical errors when in cron or in image output
  [ticket/11187] Added a blank array to fix errors in functional tests
  [ticket/10780] Make L_COLON available in the installer.
  [ticket/11183] Remove $load_extensions and weird dl() calls
  [ticket/10970] Added extra documentation to parse_dynamic_path.
  [ticket/10939] Added documentation for phpbb_request::file
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10780] Use L_COLON on LDAP page.
  [ticket/10780] Use L_COLON on search backend ACP pages.
  [ticket/10780] Use L_COLON for "download all attachments".
  [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
  [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
  [ticket/10780] Replace colon usage in adm template output with {L_COLON}
  [ticket/10780] Replace colon usage in template output with {L_COLON}
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
  [ticket/10172] Show prosilver birthday list even if there are no birthdays.
  ...

Conflicts:
	phpBB/common.php
	phpBB/download/file.php
	phpBB/includes/db/dbal.php
	phpBB/includes/db/firebird.php
	phpBB/includes/db/mssql.php
	phpBB/includes/db/mssql_odbc.php
	phpBB/includes/db/mssqlnative.php
	phpBB/includes/db/mysql.php
	phpBB/includes/db/mysqli.php
	phpBB/includes/db/oracle.php
	phpBB/includes/db/postgres.php
	phpBB/includes/db/sqlite.php
	phpBB/includes/extension/manager.php
	phpBB/install/database_update.php
2012-11-12 10:33:40 +01:00
David King
5a5e507a14 Merge remote-tracking branch 'naderman/ticket/11194' into develop
# By Nils Adermann
# Via Nils Adermann
* naderman/ticket/11194:
  [ticket/11194] Service tag data is stored in an array so access it correctly
2012-11-11 19:25:05 -05:00
Nils Adermann
09ec65cb9b [ticket/11194] Service tag data is stored in an array so access it correctly
PHPBB3-11194
2012-11-12 01:01:02 +01:00
Igor Wiedler
05380c8d0e Merge pull request #1076 from naderman/ticket/11193
[ticket/11193] Instantiate a single collection_pass for all collections
2012-11-11 10:05:06 -08:00
Nils Adermann
d2a051cdd4 [ticket/11193] Instantiate a single collection_pass for all collections
PHPBB3-11193
2012-11-11 18:39:24 +01:00
Nils Adermann
69845585a2 Merge pull request #1056 from igorw/feature/compiled-dic
[feature/compiled-dic] Compile the DI Container into a cached class
2012-11-11 09:05:15 -08:00
Igor Wiedler
1bf7f0bde7 [ticket/11152] Basic tests for the container functions
PHPBB3-11152
2012-11-11 17:56:09 +01:00
Igor Wiedler
00417fc723 [ticket/11152] Compile the install container
PHPBB3-11152
2012-11-11 17:54:54 +01:00
Igor Wiedler
5616972195 [ticket/11152] Throw error if services.yml is missing
PHPBB3-11152
2012-11-11 17:53:24 +01:00
Igor Wiedler
844770d223 [ticket/11152] Remove old container processor calls
PHPBB3-11152
2012-11-11 17:43:12 +01:00
Igor Wiedler
09781a96bc [ticket/11152] Use realpath in container extensions consistently
PHPBB-11152
2012-11-11 16:34:41 +01:00
Andreas Fischer
c699b88bc5 [ticket/11192] Add Tebibyte to get_formatted_filesize().
PHPBB3-11192
2012-11-11 14:35:31 +01:00
Igor Wiedler
3e4d3761fd [ticket/11152] Rename collection to collection_pass
PHPBB3-11152
2012-11-11 14:18:11 +01:00
Andreas Fischer
504158ceab Merge remote-tracking branch 'nickvergessen/ticket/11077' into develop
* nickvergessen/ticket/11077:
  [ticket/11077] Remove code from old global announcements system
2012-11-11 13:59:11 +01:00
Joas Schilling
f2cb4e1911 [ticket/11077] Remove code from old global announcements system
PHPBB3-11077
2012-11-11 13:04:14 +01:00
Fyorl
db0cc74af0 [ticket/11190-develop] Functional tests purge cache before running.
PHPBB3-11190
2012-11-11 10:53:44 +00:00
Fyorl
e3b0e1a8a2 [ticket/11190] Functional tests purge cache before running.
Added functions to get and purge cache to functional framework also.

PHPBB3-11190
2012-11-11 10:44:47 +00:00
Vjacheslav Trushkin
f72eaa0d95 [ticket/11175] Add microdata to prosilver
Add breadcrumb microdata to prosilver

PHPBB3-11175
2012-11-11 11:15:48 +01:00
Vjacheslav Trushkin
9b2024a48e [ticket/11175] Add microdata to subsilver2
Add breadcrumb data to subsilver2

PHPBB3-11175
2012-11-11 11:11:47 +01:00
Andreas Fischer
e86ecc0f3b Merge remote-tracking branch 'Fyorl/ticket/10939' into develop
* Fyorl/ticket/10939:
  [ticket/10939] Added documentation for phpbb_request::file
  [ticket/10939] Added tests for phpbb_request::file
  [ticket/10939] Modified the default return for $request->file
  [ticket/10939] Modified fileupload tests to deal with new behaviour
  [ticket/10939] Modified mock request class to handle deactivated $_FILES
  [ticket/10939] Modified acp_groups.php to not use $_FILES
  [ticket/10939] Modified ucp_groups.php to not use $_FILES
  [ticket/10939] Modified functions_user.php to not use $_FILES
  [ticket/10939] Modified message_parser.php to not use $_FILES
  [ticket/10939] Modified functions_upload to not use $_FILES
  [ticket/10939] Modified request test slightly to include $_FILES
  [ticket/10939] Added $_FILES handling to phpbb_request
2012-11-10 23:49:29 +01:00
Andreas Fischer
847feb07e7 Merge remote-tracking branch 'EXreaction/ticket/11189' into develop
* EXreaction/ticket/11189:
  [ticket/11189] Replace DEBUG_EXTRA with DEBUG
  [ticket/11189] Always log critical errors when in cron or in image output
2012-11-10 23:39:00 +01:00
Igor Wiedler
bdbf7d5de6 [ticket/11152] Remove @api docblocks
PHPBB3-11152
2012-11-10 23:36:13 +01:00
Igor Wiedler
8851b797fb [ticket/11152] Create separate function for debug-dependent container
PHPBB3-11152
2012-11-10 23:35:52 +01:00
Igor Wiedler
231d743ba9 [ticket/11152] Change phpbb_di_pass_cron to generic phpbb_di_pass_collection
PHPBB3-11152
2012-11-10 23:34:27 +01:00
Nathaniel Guse
bd37f7f6c0 [ticket/11189] Replace DEBUG_EXTRA with DEBUG
PHPBB3-11189
2012-11-10 10:45:02 -06:00
Nathaniel Guse
7085a6c74d [ticket/11189] Always log critical errors when in cron or in image output
PHPBB3-11189
2012-11-10 10:12:25 -06:00
Nils Adermann
f0cfae1f01 Merge pull request #881 from Fyorl/ticket/10970
Allow INCLUDE template macros to accept paths of the form {FOO}/a/{BAR}/c
2012-11-10 07:46:50 -08:00
Igor Wiedler
798c006e7f [ticket/11152] Convert cron_task_collection to generic di_service_collection
PHPBB3-11152
2012-11-10 16:38:19 +01:00
Andreas Fischer
3f933c6870 Merge remote-tracking branch 'Fyorl/ticket/11187' into develop
* Fyorl/ticket/11187:
  [ticket/11187] Added a blank array to fix errors in functional tests
2012-11-10 14:58:03 +01:00
Fyorl
c73293d826 [ticket/11187] Added a blank array to fix errors in functional tests
PHPBB3-11187
2012-11-10 13:46:40 +00:00
Joas Schilling
f7f21fa692 [ticket/11186] Database unit tests fail on windows using sqlite2
The problem is, that we try to recreate the db and reconnect to it, while the
old connection is still hold. To resolve this, we just drop all tables and
recreate the tables instead of the hole db.

PHPBB3-11186
2012-11-10 14:34:52 +01:00
Andreas Fischer
f5ed04f8ff Merge remote-tracking branch 'bantu/ticket/10780' into develop
* bantu/ticket/10780:
  [ticket/10780] Make L_COLON available in the installer.
2012-11-10 14:07:03 +01:00