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

16273 Commits

Author SHA1 Message Date
Marc Alexander
9dc9214ebb [ticket/11862] Correct var names in user_delete() events due to prune-users
Fix comments after incorrect merge of previous PR.

PHPBB3-11862
2013-09-27 13:32:37 +02:00
Joas Schilling
9d8d871369 Merge remote-tracking branch 'Marc/ticket/11862' into develop
* Marc/ticket/11862:
  [ticket/11862] Correct var names in user_delete() events due to prune-users
2013-09-27 12:58:31 +02:00
Andreas Fischer
56ee5973bc Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11864] Do not call exit after display_progress_bar in acp_forums
2013-09-26 16:01:01 +02:00
Andreas Fischer
36bf4438e4 Merge remote-tracking branch 'cyberalien/ticket/11868' into develop
* cyberalien/ticket/11868:
  [ticket/11868] Add @depends to test
  [ticket/11868] Add functional test for registration
  [ticket/11868] Replace phpbb_request_interface references
2013-09-26 14:24:50 +02:00
Vjacheslav Trushkin
0e6ac7511e [ticket/11868] Replace phpbb_request_interface references
PHPBB3-11868
2013-09-26 12:02:17 +03:00
Joas Schilling
e8303bc319 Merge remote-tracking branch 'EXreaction/ticket/11816-2' into develop
* EXreaction/ticket/11816-2:
  [ticket/11816] Fix multiple parenthesis as well before $VARs in templates
2013-09-26 10:59:14 +02:00
David King
779688b56b Merge pull request #1733 from nickvergessen/ticket/11866
Ticket/11866 Fix some more namespace issues
2013-09-25 16:49:12 -07:00
David King
427f73a323 Merge pull request #1732 from nickvergessen/ticket/11865
[ticket/11865] includes/bbcode.php is missing namespace change
2013-09-25 16:09:08 -07:00
Joas Schilling
9ead28a0fe [ticket/11866] Remove outdated and broken develop script
PHPBB3-11866
2013-09-26 00:59:25 +02:00
Joas Schilling
b27fc70a7d [ticket/11866] More namespaces
PHPBB3-11866
2013-09-26 00:58:37 +02:00
Joas Schilling
03639c081c [ticket/11866] Update some occurances of phpbb_db_ to new Namespace
PHPBB3-11866
2013-09-26 00:42:04 +02:00
Joas Schilling
2794dc4e68 [ticket/11865] Convert old class name to namespaced version
PHPBB3-11865
2013-09-26 00:11:42 +02:00
Joas Schilling
6fd6324dd6 [ticket/11805] Move page-url generating code into a new function
PHPBB3-11805
2013-09-25 17:34:48 +02:00
Joas Schilling
cf46487dea [ticket/11805] Do not generate the same link twice
There is no need to generate the prev/next links twice

PHPBB3-11805
2013-09-25 17:34:30 +02:00
Joas Schilling
f16a7e351f [ticket/11805] Fix "jump to page" feature for pagination in routes
PHPBB3-11805
2013-09-25 17:34:29 +02:00
Joas Schilling
0abb4a5ad3 [ticket/11805] Allow specifying the page in the route for pagination
Instead of "app.php?controller=news&start=10" authors might prefer having
the pagination in the route. So the sample link from above would be the
same as "app.php?controller=news/page/2". With this patch that is easily
possible. What you do is, you specify the $base_url and $start_name as follows:

	$base_url = $controller_helper->url('news/page/%d');
	$start_name = '/page/%d'; // Part of the url that will be removed
				  // for page 1

Now this will generate:
	"news"		for start = 0
		"news/page/1" will work aswell, but will not be created
	"news/page/2"	for start = 10

PHPBB3-11805
2013-09-25 17:34:28 +02:00
Nils Adermann
8da3133238 Merge pull request #1565 from naderman/ticket/11700
[WIP][ticket/11700] Namespaces
2013-09-25 07:50:22 -07:00
Nils Adermann
645bd127dd [ticket/11700] Undo migrations migration, as not an issue for new installs
PHPBB3-11700
2013-09-25 16:20:26 +02:00
Nils Adermann
cbc458e476 [ticket/11700] Update migrations table for namespaces
PHPBB3-11700
2013-09-25 16:09:14 +02:00
Marc Alexander
2c92123ca5 [ticket/11862] Correct var names in user_delete() events due to prune-users
The prune-users feature modified the names of the used variables in this
function. However, the variable names for the two events in this function
were not changed to reflect that. This patch will take care of it.

PHPBB3-11862
2013-09-25 15:59:50 +02:00
Nils Adermann
9373c0db96 [ticket/11700] Only replace phpbb_search in strings that match
PHPBB3-11700
2013-09-25 14:40:12 +02:00
Nils Adermann
3a478cb3e2 [ticket/11700] Use spaces, not tabs
PHPBB3-11700
2013-09-25 14:36:50 +02:00
Marc Alexander
c654e9d247 [ticket/11864] Do not call exit after display_progress_bar in acp_forums
The progress bar is called with the method display_progress_bar() in the
acp_forums files. This method then call adm_page_footer() which also calls
exit_handler(). Therefore, the exit; in acp_forums after
$this->display_progress_bar() is obsolete and shouldn't exist in the first
place.

PHPBB3-11864
2013-09-25 13:35:08 +02:00
Nils Adermann
86147b46a4 [ticket/11700] Return class names with leading backslash in finder
PHPBB3-11700
2013-09-25 13:15:34 +02:00
Joas Schilling
625411587d [ticket/11700] Escape Backslashes from schema_data.sql for MySQLi
PHPBB3-11700
2013-09-25 12:02:01 +02:00
Joas Schilling
ed55626165 [ticket/11700] Fix unresolvable condition in migration
PHPBB3-11700
2013-09-25 10:01:44 +02:00
Andreas Fischer
717e2337b9 Merge remote-tracking branch 'cyberalien/ticket/11846' into develop
* cyberalien/ticket/11846:
  [ticket/11846] Replace empty p with margin-top
2013-09-23 12:52:43 +02:00
Andreas Fischer
41dd9d3b49 Merge remote-tracking branch 'fredsa/ticket/11606' into develop
* fredsa/ticket/11606:
  [ticket/11606] remove preg_replace() /e modifier in make_clickable()
2013-09-23 02:25:13 +02:00
Nils Adermann
1f9f96926f [ticket/11700] No need to escape \ in SQL string
PHPBB3-11700
2013-09-19 20:31:00 +02:00
Nils Adermann
6b71284681 [ticket/11700] Correctly load templates for extensions
PHPBB3-11700
2013-09-19 19:53:57 +02:00
Nathan Guse
9152455d70 [ticket/11816] Fix multiple parenthesis as well before $VARs in templates
PHPBB3-11816
2013-09-19 12:40:53 -05:00
Nils Adermann
fe36375a36 [ticket/11700] Fix extension loading with namespaces
class loader now expects all classes to be prefixed with a backslash
when resolving paths

PHPBB3-11700
2013-09-19 18:29:08 +02:00
Nils Adermann
f205c4fad4 [ticket/11700] Change search backend db entry to namespaces
PHPBB3-11700
2013-09-19 17:03:05 +02:00
Nils Adermann
e998363468 [ticket/11700] Fix redirection in common.php until fs dependency on request is removed
PHPBB3-11700
2013-09-19 17:01:16 +02:00
Nils Adermann
40ea7422b1 [ticket/11700] Correctly load avatar templates for namespaced drivers
PHPBB3-11700
2013-09-19 16:21:38 +02:00
Nils Adermann
733020f5f9 [ticket/11700] Correct ucp_auth_link request interface references
PHPBB3-11700
2013-09-19 16:19:05 +02:00
Nils Adermann
15413f43e4 [ticket/11700] Correctly handle avatar drivers with namespaces
PHPBB3-11700
2013-09-19 15:45:35 +02:00
Nils Adermann
06e7c84235 [ticket/11700] Fix some more incorrectly changed comments
PHPBB3-11700
2013-09-19 15:27:03 +02:00
Nils Adermann
cc6f1e1775 [ticket/11700] Add file headers to develop scripts for namespace
PHPBB3-11700
2013-09-19 15:16:45 +02:00
Nils Adermann
1adcbccc09 [ticket/11700] Replace some leftover phpbb_filesystem uses
PHPBB3-11700
2013-09-17 18:56:47 +02:00
Nils Adermann
1d7f8f8193 [ticket/11700] Get functional tests running after develop merge
PHPBB3-11700
2013-09-17 18:10:58 +02:00
Nils Adermann
9d8ac2b0ce [ticket/11700] Fix unit tests after develop merge
PHPBB3-11700
2013-09-17 17:12:41 +02:00
Nils Adermann
f039a3308a Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700
* github-phpbb/develop:
  [ticket/11832] Correct paths in tests
  [ticket/11832] Correct ROOT_PATH variable
  [ticket/11832] get_url() from phpbb_template_asset should return web path
  [ticket/11832] Fix INCLUDE(JS/CSS)
  [ticket/11832] Fix constructions of phpbb_filesystem
  [ticket/11832] Fix smiley paths
  [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request
  [ticket/11832] Fix build_url and the S_LOGIN_ACTION
  [ticket/11832] Changing comments to say app.php rather than index.php
  [ticket/11832] We must instantiate the $phpbb_filesystem in common
  [ticket/11832] Fix the web path corrections
  [ticket/11832] More extensive testing
  [ticket/11832] Use dirname(__FILE__)
  [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid
  Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework"
  [ticket/11832] Make $phpbb_container a global initiated by the framework
  [ticket/11832] Fix log tests
  [ticket/11832] update_web_root_path helper and tests
  [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)

Conflicts:
	phpBB/common.php
	phpBB/config/services.yml
	phpBB/includes/bbcode.php
	phpBB/includes/functions.php
	phpBB/includes/functions_messenger.php
	phpBB/install/index.php
	phpBB/phpbb/filesystem.php
	phpBB/phpbb/template/twig/environment.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/dbal/migrator_test.php
	tests/extension/manager_test.php
	tests/extension/metadata_manager_test.php
	tests/filesystem/clean_path_test.php
	tests/mock/extension_manager.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php
2013-09-17 16:56:50 +02:00
Nils Adermann
13ba981fc3 [ticket/11700] Add back accidently deleted file in cache dir
PHPBB3-11700
2013-09-17 16:18:04 +02:00
Nils Adermann
c4b53490ad [ticket/11700] Correctly load extensions with nonprefixed namespaces
PHPBB3-11700
2013-09-17 16:15:44 +02:00
Joas Schilling
6ba2fb6d62 Merge remote-tracking branch 'EXreaction/ticket/11832' into develop
* EXreaction/ticket/11832:
  [ticket/11832] Correct paths in tests
  [ticket/11832] Correct ROOT_PATH variable
  [ticket/11832] get_url() from phpbb_template_asset should return web path
  [ticket/11832] Fix INCLUDE(JS/CSS)
  [ticket/11832] Fix constructions of phpbb_filesystem
  [ticket/11832] Fix smiley paths
  [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request
  [ticket/11832] Fix build_url and the S_LOGIN_ACTION
  [ticket/11832] Changing comments to say app.php rather than index.php
  [ticket/11832] We must instantiate the $phpbb_filesystem in common
  [ticket/11832] Fix the web path corrections
  [ticket/11832] More extensive testing
  [ticket/11832] Use dirname(__FILE__)
  [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid
  Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework"
  [ticket/11832] Make $phpbb_container a global initiated by the framework
  [ticket/11832] Fix log tests
  [ticket/11832] update_web_root_path helper and tests
  [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)
2013-09-16 21:33:52 +02:00
Nils Adermann
d12f358855 [ticket/11700] Correctly convert old acm type to namespaced class name
PHPBB3-11700
2013-09-16 17:33:56 +02:00
Nils Adermann
77ffd5c6ba [ticket/11700] Use underscores in avatar driver template file names
PHPBB3-11700
2013-09-16 06:44:16 +02:00
Nils Adermann
570b83b046 [ticket/11700] namespacify phpbb_permissions class
PHPBB3-11700
2013-09-16 06:30:50 +02:00
Nils Adermann
3634ff14a0 [ticket/11700] Correct service definitions with namespaces
PHPBB3-11700
2013-09-16 06:16:53 +02:00