mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
18,624 Commits 17 Branches 190 Tags
Commit Graph

18624 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nils Adermann
3209d3c69a Merge pull request #3 from nickvergessen/ticket/naderman/11700 
Ticket/naderman/11700
 2013-09-25 03:39:02 -07: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
rechosen
bf5ce957cf [ticket/11786] Fix indentation in the PHPDoc of core.group_delete_user_before 
The core.group_delete_user_before event had bad indentation in its PHPDoc.
Fixed.

PHPBB3-11786
 2013-09-23 18:10:41 +02:00
rechosen
e45b69ee09 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11786 2013-09-23 18:08:29 +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
16fdef4866 [ticket/11700] Get unit tests to run again with namespaces 
PHPBB3-11700
 2013-09-19 18:50:08 +02:00
Nathan Guse
2ee22d4615 [ticket/11850] Fix extract current page test 
PHPBB3-11850
 2013-09-19 11:49:13 -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
Nathan Guse
d85ae0f7bc [ticket/11850] Add test for outside of the phpBB directory 
PHPBB3-11850
 2013-09-18 09:25:58 -05:00
Nathan Guse
9c535da528 [ticket/11850] page_name contains controller request rather than query string 
Fixing tests

PHPBB3-11850
 2013-09-17 22:00:06 -05:00
Nils Adermann
1adcbccc09 [ticket/11700] Replace some leftover phpbb_filesystem uses 
PHPBB3-11700
 2013-09-17 18:56:47 +02:00
Nathan Guse
f4317bc864 [ticket/11850] Fix $user->page on pages through the controller 
PHPBB3-11850
 2013-09-17 11:44:42 -05:00
Nils Adermann
1a92c04ee3 [ticket/11700] Namespacif skipped filesystem instantiation in test 
PHPBB3-11700
 2013-09-17 18:30:19 +02:00
Nils Adermann
20b2d03e3b [ticket/11700] Namespace needed for mock object in web path test 
PHPBB3-11700
 2013-09-17 18:18:31 +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
Nils Adermann
6e6681fa59 [ticket/11700] Load avatar explanations correctly from namespaces 
PHPBB3-11700
 2013-09-16 05:58:40 +02:00
Nils Adermann
fcd36ddd1f [ticket/11700] Correctly generate lang key from avatar driver class 
PHPBB3-11700
 2013-09-16 05:36:21 +02:00
Nils Adermann
d905358e2b [ticket/11700] Fix leftover backslashes in comments 
PHPBB3-11700
 2013-09-16 05:20:27 +02:00
Nils Adermann
8b8ba3d7ac [ticket/11700] Check for ALLOW_REMOTE_UPLOAD in acp output as expected 
PHPBB3-11700
 2013-09-16 05:03:41 +02:00
Nils Adermann
390dc86344 [ticket/11700] And some last comments with backslashes 
PHPBB3-11700
 2013-09-16 05:00:18 +02:00
Nils Adermann
ee1c15fe7e [ticket/11700] Fix another case of non-namespaced classnames 
PHPBB3-11700
 2013-09-16 04:47:39 +02:00
Nils Adermann
d626ebaf1e [ticket/11700] Fix a few more comments 
PHPBB3-11700
 2013-09-16 04:45:58 +02:00
Nils Adermann
ccbb070652 [ticket/11700] The driver is namespaced now, so properly replace it 
PHPBB3-11700
 2013-09-16 04:19:52 +02:00
Nils Adermann
721483cd64 [ticket/11700] Default db driver for tests must not lead with \ 
PHPBB3-11700
 2013-09-16 04:07:30 +02:00
Nils Adermann
005c5118cf [ticket/11700] travis has hardcoded driver class names without namespaces 
PHPBB3-11700
 2013-09-16 04:01:18 +02:00
Nils Adermann
acea8f5c0a [ticket/11700] The word "them" in a comment is not a class 
PHPBB3-11700
 2013-09-16 03:51:42 +02:00
Nils Adermann
3860b37741 [ticket/11700] Actually "one" in comments is not a class 
PHPBB3-11700
 2013-09-16 03:50:47 +02:00