Merge branch 'develop' into feature/avatars

* develop: (335 commits)
  [ticket/10575] Adding public visibility to the methods.
  [ticket/10575] Fixing non-static access to static functions get_instance
  [ticket/10547] User is not logged in as admin after installation
  [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
  [ticket/10650] Added checking for empty subjects
  [ticket/10650] Corrected intendation
  [ticket/10650]Added permission checking and utf8 functions
  [ticket/10650] Cropped subject and inserted newline
  [ticket/10650] Corrected space before true
  [ticket/10650] Changed language files and forumlist
  [ticket/10650] Added static sql files
  [ticket/10650] Displaying last topic on forum list
  [ticket/10760] Fix numbering in php fun facts.
  [ticket/10760] Value must be quoted as it might be two words.
  [ticket/10760] PHP is great. This commit is the proof.
  [ticket/10760] Catch both versions of parse error output in php.
  [ticket/10607] Added 'Powered by' translation string.
  [ticket/10760] Account for display_errors=stderr in pre-commit hook.
  [ticket/10760] Quote PHP_BIN when using it.
  [ticket/10760] Use echo -e only if echo understands -e.
  ...

phpBB/install/database_update.php

@@ -84,8 +84,6 @@ if (!empty($load_extensions) && function_exists('dl'))
 
 // Include files
 require($phpbb_root_path . 'includes/class_loader.' . $phpEx);
-require($phpbb_root_path . 'includes/session.' . $phpEx);
-require($phpbb_root_path . 'includes/auth.' . $phpEx);
 
 require($phpbb_root_path . 'includes/functions.' . $phpEx);
 
@@ -120,8 +118,9 @@ $cache = $cache_factory->get_service();
 $phpbb_class_loader_ext->set_cache($cache->get_driver());
 $phpbb_class_loader->set_cache($cache->get_driver());
 
+$phpbb_dispatcher = new phpbb_event_dispatcher();
 $request = new phpbb_request();
-$user = new user();
+$user = new phpbb_user();
 $db = new $sql_db();
 
 // make sure request_var uses this request instance
@@ -1088,6 +1087,15 @@ function database_update_info()
 				PROFILE_FIELDS_TABLE	=> array(
 					'field_show_on_pm'		=> array('BOOL', 0),
 				),
+				STYLES_TABLE		=> array(
+					'style_path'			=> array('VCHAR:100', ''),
+					'bbcode_bitfield'		=> array('VCHAR:255', 'kNg='),
+					'style_parent_id'		=> array('UINT:4', 0),
+					'style_parent_tree'		=> array('TEXT', ''),
+				),
+				REPORTS_TABLE		=> array(
+					'reported_post_text'	=> array('MTEXT_UNI', ''),
+				),
 			),
 			'change_columns'	=> array(
 				GROUPS_TABLE		=> array(
@@ -1101,20 +1109,16 @@ function database_update_info()
 			'drop_columns'      => array(
 			    STYLES_TABLE		    => array(
 			        'imageset_id',
+			        'template_id',
+			        'theme_id',
                 ),
-				STYLES_TEMPLATE_TABLE	=> array(
-					'template_storedb',
-				),
-				STYLES_THEME_TABLE		=> array(
-					'theme_storedb',
-					'theme_mtime',
-					'theme_data',
-				),
             ),
             'drop_tables'       => array(
                 STYLES_IMAGESET_TABLE,
                 STYLES_IMAGESET_DATA_TABLE,
+                STYLES_TEMPLATE_TABLE,
                 STYLES_TEMPLATE_DATA_TABLE,
+                STYLES_THEME_TABLE,
             ),
 		),
 	);
@@ -2271,12 +2275,33 @@ function change_database_data(&$no_updates, $version)
 					'auth'		=> 'acl_a_attach',
 					'cat'		=> 'ACP_ATTACHMENTS',
 				),
+				'install'	=> array(
+					'base'		=> 'acp_styles',
+					'class'		=> 'acp',
+					'title'		=> 'ACP_STYLES_INSTALL',
+					'auth'		=> 'acl_a_styles',
+					'cat'		=> 'ACP_STYLE_MANAGEMENT',
+				),
+				'edit'	=> array(
+					'base'		=> 'acp_styles',
+					'class'		=> 'acp',
+					'title'		=> 'ACP_STYLES_EDIT',
+					'auth'		=> 'acl_a_styles',
+					'cat'		=> 'ACP_STYLE_MANAGEMENT',
+				),
+				'cache'	=> array(
+					'base'		=> 'acp_styles',
+					'class'		=> 'acp',
+					'title'		=> 'ACP_STYLES_CACHE',
+					'auth'		=> 'acl_a_styles',
+					'cat'		=> 'ACP_STYLE_MANAGEMENT',
+				),
 			);
 
 			_add_modules($modules_to_install);
 
 			$sql = 'DELETE FROM ' . MODULES_TABLE . "
-			    WHERE module_basename = 'styles' AND module_mode = 'imageset'";
+			    WHERE (module_basename = 'styles' OR module_basename = 'acp_styles') AND (module_mode = 'imageset' OR module_mode = 'theme' OR module_mode = 'template')";
 			_sql($sql, $errored, $error_ary);
 
 			// Localise Global Announcements
@@ -2366,7 +2391,13 @@ function change_database_data(&$no_updates, $version)
 			{
 				set_config('teampage_memberships', '1');
 			}
+			
+			// Clear styles table and add prosilver entry
+			_sql('DELETE FROM ' . STYLES_TABLE, $errored, $error_ary);
 
+			$sql = 'INSERT INTO ' . STYLES_TABLE . " (style_name, style_copyright, style_active, style_path, bbcode_bitfield, style_parent_id, style_parent_tree) VALUES ('prosilver', '© phpBB Group', 1, 'prosilver', 'kNg=', 0, '')";
+			_sql($sql, $errored, $error_ary);
+			
 			$no_updates = false;
 
 		break;