Crizzo 
							
						 
					 
					
						
						
							
						
						d95d062a42 
					 
					
						
						
							
							[ticket/10549] using correct variable in includes/functions_module.php too  
						
						... 
						
						
						
						PHPBB3-10549 
						
						
					 
					
						2014-03-11 18:45:46 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						ad6fda5776 
					 
					
						
						
							
							Merge remote-tracking branch 'rxu3/ticket/12260' into develop  
						
						... 
						
						
						
						* rxu3/ticket/12260:
  [ticket/12260] Add core events to delete_posts() function. 
						
						
					 
					
						2014-03-11 17:55:38 +01:00 
						 
				 
			
				
					
						
							
							
								rxu 
							
						 
					 
					
						
						
							
						
						e8b7f68406 
					 
					
						
						
							
							[ticket/12260] Add core events to delete_posts() function.  
						
						... 
						
						
						
						Events for extensions to perform additional actions on posts deletion.
PHPBB3-12260 
						
						
					 
					
						2014-03-11 23:31:11 +08:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						214f515e9c 
					 
					
						
						
							
							Merge remote-tracking branch 'dhruvgoel92/ticket/11288' into develop-olympus  
						
						... 
						
						
						
						* dhruvgoel92/ticket/11288:
  [ticket/11288] Handle +,- without preceeding whitespace characters 
						
						
					 
					
						2014-03-11 09:46:31 +01:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						3181c44fc9 
					 
					
						
						
							
							Merge branch 'develop-olympus' into develop  
						
						... 
						
						
						
						* develop-olympus:
  [ticket/10549] Adds language variables
Conflicts:
	phpBB/includes/functions_module.php 
						
						
					 
					
						2014-03-10 21:44:04 -05:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						23ea833425 
					 
					
						
						
							
							Merge pull request  #2101  from nickvergessen/ticket/10763  
						
						... 
						
						
						
						[ticket/10763] Do not call non-static functions statically 
						
						
					 
					
						2014-03-10 20:51:20 -05:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						f7020fb5d1 
					 
					
						
						
							
							Merge pull request  #2092  from nickvergessen/ticket/12090  
						
						... 
						
						
						
						[ticket/12090] Pass route name to url() instead of the url itself 
						
						
					 
					
						2014-03-10 20:50:08 -05:00 
						 
				 
			
				
					
						
							
							
								Crizzo 
							
						 
					 
					
						
						
							
						
						ec4c9833ca 
					 
					
						
						
							
							[ticket/10549] Adds language variables  
						
						... 
						
						
						
						PHPBB3-10549 
						
						
					 
					
						2014-03-10 18:35:23 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						e8fdc1545a 
					 
					
						
						
							
							[ticket/12261] Add a functional test for redirect after using login_box()  
						
						... 
						
						
						
						PHPBB3-12261 
						
						
					 
					
						2014-03-10 12:35:30 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						b876c07377 
					 
					
						
						
							
							[ticket/12261] Remove web root path from login redirect url  
						
						... 
						
						
						
						The redirect url must be relative to the ucp.php and not relative to the
current page.
PHPBB3-12261 
						
						
					 
					
						2014-03-10 10:15:38 +01:00 
						 
				 
			
				
					
						
							
							
								Nathaniel Guse 
							
						 
					 
					
						
						
							
						
						f3d8dfd1e3 
					 
					
						
						
							
							[ticket/12202] Can't call htmlspecialchars before checking for quotes  
						
						... 
						
						
						
						PHPBB3-12202 
						
						
					 
					
						2014-03-09 17:17:33 -05:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						521c6c7d75 
					 
					
						
						
							
							[ticket/10763] Do not call messenger::error() statically  
						
						... 
						
						
						
						PHPBB3-10763 
						
						
					 
					
						2014-03-09 22:03:38 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						37dace4967 
					 
					
						
						
							
							[ticket/10763] Do not call non-static transfer() statically  
						
						... 
						
						
						
						PHPBB3-10763 
						
						
					 
					
						2014-03-09 21:53:21 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						38aef98a69 
					 
					
						
						
							
							[ticket/10763] Fix static calls to non static methods in colour_manager  
						
						... 
						
						
						
						PHPBB3-10763 
						
						
					 
					
						2014-03-09 21:42:59 +01:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						f2d3879da4 
					 
					
						
						
							
							[ticket/12202] Apply htmlspecialchars to style.cfg data  
						
						... 
						
						
						
						PHPBB3-12202 
						
						
					 
					
						2014-03-09 15:19:52 -05:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						2eb24d0ace 
					 
					
						
						
							
							[ticket/12090] Split finding routes and returning routes into 2 methods  
						
						... 
						
						
						
						PHPBB3-12090 
						
						
					 
					
						2014-03-09 18:38:21 +01:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						c305bd25e4 
					 
					
						
						
							
							Merge pull request  #2074  from Crizz0/ticket/12240  
						
						... 
						
						
						
						Ticket/12240 - Adds specific class to BBCode-Buttons in Template incl. Custom-BBCode support 
						
						
					 
					
						2014-03-08 19:20:22 -06:00 
						 
				 
			
				
					
						
							
							
								Dhruv 
							
						 
					 
					
						
						
							
						
						c51dcbe6a0 
					 
					
						
						
							
							[ticket/10945] Fix return values for split_keywords function  
						
						... 
						
						
						
						The function now returns false if all the words are common words and true
otherwise.
PHPBB3-10945 
						
						
					 
					
						2014-03-08 21:23:08 +05:30 
						 
				 
			
				
					
						
							
							
								Dhruv 
							
						 
					 
					
						
						
							
						
						b6eec5c142 
					 
					
						
						
							
							[ticket/10945] Display search query when search fails in native search  
						
						... 
						
						
						
						If search fails and common words are present, split_keywords returns false
and search.php file prints appropriate message of common words.
If search fails and there are no common words, split_keywords returns true
and keyword_search returns false so that the search query is displayed in
search box.
PHPBB3-10945 
						
						
					 
					
						2014-03-08 21:20:37 +05:30 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						07c07171f9 
					 
					
						
						
							
							[ticket/12090] Make provider a service and inject it into the helper  
						
						... 
						
						
						
						PHPBB3-12090 
						
						
					 
					
						2014-03-08 16:37:22 +01:00 
						 
				 
			
				
					
						
							
							
								Varun Agrawal 
							
						 
					 
					
						
						
							
						
						429c006440 
					 
					
						
						
							
							[ticket/12250] Remove deprecated phpbb_clean_path function  
						
						... 
						
						
						
						The function phpbb_clean_path() in functions.php is deprecated and is
replaced by filesystem class. Therefore, this function is moved to the
functions_compatibility file.
PHPBB3-12250 
						
						
					 
					
						2014-03-07 03:44:28 +05:30 
						 
				 
			
				
					
						
							
							
								Varun Agrawal 
							
						 
					 
					
						
						
							
						
						1cf8554d0e 
					 
					
						
						
							
							[ticket/12250] Remove deprecated phpbb_clean_path function  
						
						... 
						
						
						
						The function phpbb_clean_path() in functions.php is deprecated as is not
used used 3.0/3.1 core
PHPBB3-12250 
						
						
					 
					
						2014-03-06 23:51:49 +05:30 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						c40b15ae19 
					 
					
						
						
							
							Merge pull request  #2087  from marc1706/ticket/12239  
						
						... 
						
						
						
						[ticket/12239] Move deprecated passwords functions to compatibility file 
						
						
					 
					
						2014-03-06 07:00:30 -06:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						6251ca1459 
					 
					
						
						
							
							[ticket/12239] Move deprecated passwords functions to compatibility file  
						
						... 
						
						
						
						The deprecated passwords functions are no longer used in the core and have
been replaced with the passwords manager. Therefore, the functions are
moved to the functions_compatibility file.
PHPBB3-12239 
						
						
					 
					
						2014-03-06 09:43:52 +01:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						43074a1b69 
					 
					
						
						
							
							[ticket/9871] Restore phpbb_version_compare  
						
						... 
						
						
						
						PHPBB3-9871 
						
						
					 
					
						2014-03-05 19:09:47 -06:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						8748032866 
					 
					
						
						
							
							[ticket/9871] Restore get_remote_file  
						
						... 
						
						
						
						PHPBB3-9871 
						
						
					 
					
						2014-03-05 19:07:39 -06:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						6a8f110b5a 
					 
					
						
						
							
							[ticket/9871] Use $request->variable instead of request_var  
						
						... 
						
						
						
						PHPBB3-9871 
						
						
					 
					
						2014-03-05 19:00:52 -06:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						f2059f52f3 
					 
					
						
						
							
							[ticket/12236] Move AOL Instant Messanger field to custom profile field  
						
						... 
						
						
						
						PHPBB3-12236 
						
						
					 
					
						2014-03-05 22:13:22 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						2e5106aae1 
					 
					
						
						
							
							[ticket/12237] Convert yahoo messanger to custom profile field  
						
						... 
						
						
						
						PHPBB3-12237 
						
						
					 
					
						2014-03-05 21:38:57 +01:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						0e35a85155 
					 
					
						
						
							
							Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into develop  
						
						... 
						
						
						
						* github-nickvergessen/ticket/12235:
  [ticket/12235] Convert WLM to custom profile field
  [ticket/12187] Do not make clickable when using as contact field
  [ticket/12187] Split generate_profile_fields_template() into 2 methods
  [ticket/12187] Remove user_website field
  [ticket/12187] Remove user_website functionality
  [ticket/12187] Convert website field data to custom profile field
  [ticket/12187] Add URL type for profile fields
  [ticket/12234] Replace ICQ with custom profile field
  [ticket/12233] Update schema file
  [ticket/12233] Add images back to subsilver2
  [ticket/12233] Allow profile fields to be contact fields
Conflicts:
	phpBB/adm/style/acp_prune_users.html 
						
						
					 
					
						2014-03-05 11:49:11 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						83a7e632b9 
					 
					
						
						
							
							[ticket/12235] Convert WLM to custom profile field  
						
						... 
						
						
						
						PHPBB3-12235 
						
						
					 
					
						2014-03-04 10:19:08 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						c650078904 
					 
					
						
						
							
							[ticket/12187] Split generate_profile_fields_template() into 2 methods  
						
						... 
						
						
						
						Removing the mode switch that wraps the content of the method
PHPBB3-12187 
						
						
					 
					
						2014-03-04 08:47:47 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						a3627a9ff7 
					 
					
						
						
							
							[ticket/12187] Remove user_website field  
						
						... 
						
						
						
						PHPBB3-12187 
						
						
					 
					
						2014-03-04 08:25:36 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						5b1fbfb2f2 
					 
					
						
						
							
							[ticket/12187] Remove user_website functionality  
						
						... 
						
						
						
						PHPBB3-12187 
						
						
					 
					
						2014-03-03 20:01:19 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						e750d71f84 
					 
					
						
						
							
							[ticket/12187] Convert website field data to custom profile field  
						
						... 
						
						
						
						PHPBB3-12187 
						
						
					 
					
						2014-03-03 12:38:55 +01:00 
						 
				 
			
				
					
						
							
							
								Crizzo 
							
						 
					 
					
						
						
							
						
						281df15a53 
					 
					
						
						
							
							[ticket/12240] Added class code for custom bbcodes based on bbcode_tag  
						
						... 
						
						
						
						PHPBB3-12240 
						
						
					 
					
						2014-03-02 20:30:09 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						76409388af 
					 
					
						
						
							
							[ticket/12234] Replace ICQ with custom profile field  
						
						... 
						
						
						
						PHPBB3-12234 
						
						
					 
					
						2014-02-28 15:24:35 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						a823205403 
					 
					
						
						
							
							[ticket/12233] Allow profile fields to be contact fields  
						
						... 
						
						
						
						Contact fields are displayed with in the contact section of the user profile
and are displayed differently in the mini profile next to posts and private
messages
PHPBB3-12233 
						
						
					 
					
						2014-02-28 14:38:03 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						ffbc7ccb64 
					 
					
						
						
							
							[ticket/12205] Do not display 0 for empty integers when show_novalue is off  
						
						... 
						
						
						
						PHPBB3-12205 
						
						
					 
					
						2014-02-25 18:24:45 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						87dfd76100 
					 
					
						
						
							
							[ticket/12226] Split language strings to correctly allow multiple plural rules  
						
						... 
						
						
						
						PHPBB3-12226 
						
						
					 
					
						2014-02-24 09:46:31 +01:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						fc33a0c176 
					 
					
						
						
							
							[ticket/12160] Move phpbb_check_installation_exists() to functions_install.php  
						
						... 
						
						
						
						PHPBB3-12160 
						
						
					 
					
						2014-02-22 20:22:36 -08:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						c0c19fbb29 
					 
					
						
						
							
							Merge pull request  #2035  from prototech/ticket/12138  
						
						... 
						
						
						
						[ticket/12138] Include file time limit when generating attachment management pagination and stats. 
						
						
					 
					
						2014-02-20 21:13:06 -06:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						2df2032b48 
					 
					
						
						
							
							Merge pull request  #2025  from marc1706/ticket/12183  
						
						... 
						
						
						
						[ticket/12183] Update user_newpasswd column in users table for passwords manager 
						
						
					 
					
						2014-02-20 20:54:30 -06:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						b8d30bfc80 
					 
					
						
						
							
							Merge pull request  #2021  from nickvergessen/ticket/12171  
						
						... 
						
						
						
						Ticket/12171 Attachments from soft-deleted posts are still downloadable 
						
						
					 
					
						2014-02-20 20:51:58 -06:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						6c8589775b 
					 
					
						
						
							
							[ticket/9871] Update version check file to use json format  
						
						... 
						
						
						
						PHPBB3-9871 
						
						
					 
					
						2014-02-19 16:13:23 -06:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						60de5e66de 
					 
					
						
						
							
							Merge pull request  #2030  from rxu/ticket/12190  
						
						... 
						
						
						
						Add core event "core.modify_submit_post_data" 
						
						
					 
					
						2014-02-19 10:50:21 -06:00 
						 
				 
			
				
					
						
							
							
								rxu 
							
						 
					 
					
						
						
							
						
						01bf27f789 
					 
					
						
						
							
							[ticket/12190] Add core event "core.modify_submit_post_data"  
						
						... 
						
						
						
						Add core event - core.modify_submit_post_data
to submit_post() function. This allows extensions to modify the
whole post data before the post submitting, or even provide
its own post submit procedure.
PHPBB3-12190 
						
						
					 
					
						2014-02-20 00:47:26 +08:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						c30668b010 
					 
					
						
						
							
							Merge pull request  #2045  from rxu/ticket/12213  
						
						... 
						
						
						
						[ticket/12213] Add MCP events for custom quick moderation options 
						
						
					 
					
						2014-02-19 10:42:17 -06:00 
						 
				 
			
				
					
						
							
							
								rxu 
							
						 
					 
					
						
						
							
						
						b7dea19bf3 
					 
					
						
						
							
							[ticket/12213] Add MCP events for custom quick moderation options  
						
						... 
						
						
						
						Add core events to mcp.php and mcp_main.php. This allows
extensions to add and to handle custom quick moderation options.
PHPBB3-12213 
						
						
					 
					
						2014-02-20 00:38:28 +08:00 
						 
				 
			
				
					
						
							
							
								Nathan Guse 
							
						 
					 
					
						
						
							
						
						7015fc8a00 
					 
					
						
						
							
							Merge pull request  #2002  from prototech/ticket/12153  
						
						... 
						
						
						
						[ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination() 
						
						
					 
					
						2014-02-18 14:11:48 -06:00