mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-03 07:18:08 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into feature/merging-style-components

Browse Source 
* develop: (175 commits)
  [feature/ajax] Remove strange non-breaking spaces from approve button
  [feature/ajax] Add entirely unrelated but nice newlines
  [feature/ajax] Unify phpbb_json_response instantiation
  [feature/ajax] Fix acp_styles activate_deactivate ajax callback name
  [feature/ajax] Send correct activate/deactivate JSON response in acp_profile
  [ticket/10270] Alter background colors for posts
  [feature/ajax] Remove not working module enable/disable ajax code
  [feature/ajax] Replace static call to phpbb_request with OO
  [feature/ajax] Remove quick-reply AJAX handling until we have something good
  [ticket/10270] Changing close button for ajax popups
  [ticket/10270] Disabling links in disappearing content
  [ticket/10291] Fixed an AJAX bug on quick reply form submit.
  [ticket/10273] Fixed accepting / denying posts AJAX.
  [ticket/10272] Removed code that was prevent event propogation in AJAX.
  [ticket/10291] Fixed a bug in the quick reply AJAX.
  [feature/ajax] Handle acp_modules error cases with JSON response
  [feature/ajax] Fix filter check, quick mod tools data-attribute
  [feature/ajax] Use the error handler
  [feature/ajax] Generic error handling with a phpbb.alert box
  [feature/ajax] Change filter semantics, some minor adjustments
  ...

Conflicts:
	phpBB/adm/style/acp_styles.html
	phpBB/includes/acp/acp_styles.php
This commit is contained in:
Vjacheslav Trushkin
2012-03-31 10:43:06 +03:00
parent 506951e8af 013a8649a5
commit 398a6c8045
81 changed files with 1716 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/common.php
View File

@@ -15,6 +15,8 @@ if (!defined('IN_PHPBB'))
exit;
}
use Symfony\Component\EventDispatcher\EventDispatcher;
require($phpbb_root_path . 'includes/startup.' . $phpEx);
if (file_exists($phpbb_root_path . 'config.' . $phpEx))
@@ -98,6 +100,7 @@ $phpbb_class_loader_ext->set_cache($cache->get_driver());
$phpbb_class_loader->set_cache($cache->get_driver());
// Instantiate some basic classes
$phpbb_dispatcher = new phpbb_event_dispatcher();
$request = new phpbb_request();
$user = new user();
$auth = new auth();
@@ -124,6 +127,9 @@ $phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_ro
$style = new phpbb_style($phpbb_root_path, $phpEx, $config, $user, $phpbb_extension_manager);
$template = $style->template;
$phpbb_subscriber_loader = new phpbb_event_extension_subscriber_loader($phpbb_dispatcher, $phpbb_extension_manager);
$phpbb_subscriber_loader->load();
// Add own hook handler
require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display')));