Marc Alexander 
							
						 
					 
					
						
						
							
						
						f658e062b2 
					 
					
						
						
							
							Merge branch '3.1.x' into 3.2.x  
						
						
						
						
					 
					
						2016-10-28 21:06:21 +02:00 
						 
				 
			
				
					
						
							
							
								rxu 
							
						 
					 
					
						
						
							
						
						8afa9fdf28 
					 
					
						
						
							
							[ticket/14830] Fix FORM_INVALID error during AСP search index deletion  
						
						... 
						
						
						
						PHPBB3-14830 
						
						
					 
					
						2016-10-21 01:23:45 +07:00 
						 
				 
			
				
					
						
							
							
								rxu 
							
						 
					 
					
						
						
							
						
						eca10dc08f 
					 
					
						
						
							
							[ticket/14830] Fix FORM_INVALID error on search backend changing  
						
						... 
						
						
						
						PHPBB3-14830 
						
						
					 
					
						2016-10-21 01:23:44 +07:00 
						 
				 
			
				
					
						
							
							
								rxu 
							
						 
					 
					
						
						
							
						
						8e54c9ef8b 
					 
					
						
						
							
							[ticket/14830] Fix link hash checking case  
						
						... 
						
						
						
						PHPBB3-14830 
						
						
					 
					
						2016-10-21 01:23:43 +07:00 
						 
				 
			
				
					
						
							
							
								rxu 
							
						 
					 
					
						
						
							
						
						832a87b924 
					 
					
						
						
							
							[ticket/14830] Fix FORM_INVALID error during AXP search index creation/deletion  
						
						... 
						
						
						
						PHPBB3-14830 
						
						
					 
					
						2016-10-21 01:23:43 +07:00 
						 
				 
			
				
					
						
							
							
								Tristan Darricau 
							
						 
					 
					
						
						
							
						
						19bbbfe0f3 
					 
					
						
						
							
							Merge branch '3.1.x' into 3.2.x  
						
						... 
						
						
						
						* 3.1.x:
  [ticket/14789] Add form tokens to tests and uncomment add_form_key
  [ticket/14789] Add link hashes and form tokens to all acp links/buttons 
						
						
					 
					
						2016-09-18 21:14:47 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						72f6241aa2 
					 
					
						
						
							
							[ticket/14789] Add form tokens to tests and uncomment add_form_key  
						
						... 
						
						
						
						PHPBB3-14789 
						
						
					 
					
						2016-09-18 15:30:25 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						585a3ed863 
					 
					
						
						
							
							[ticket/14789] Add link hashes and form tokens to all acp links/buttons  
						
						... 
						
						
						
						This will further harden the ACP security by adding link hashes to links and
form tokens to forms that did not have these yet and result in modified
settings or write action on the filesystem or database. These few links and
forms were still relying on the global ACP protection, mainly due to them
not posing further risks of compromising data. After this change these will
now also be properly protected against tampering.
PHPBB3-14789 
						
						
					 
					
						2016-09-18 15:29:50 +02:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						266576c6a4 
					 
					
						
						
							
							[ticket/13454] Remove unused variables  
						
						... 
						
						
						
						Part 4
PHPBB3-13454 
						
						
					 
					
						2016-01-06 13:52:11 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						f50ba9ab4f 
					 
					
						
						
							
							[ticket/13454] Remove unused variables  
						
						... 
						
						
						
						This is part 2 of the pr.
PHPBB3-13454 
						
						
					 
					
						2016-01-06 13:52:11 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						73e6e5b77f 
					 
					
						
						
							
							[ticket/13454] Remove unused variables  
						
						... 
						
						
						
						This is the first part of the changes. More to come.
PHPBB3-13454 
						
						
					 
					
						2016-01-06 13:51:19 +01:00 
						 
				 
			
				
					
						
							
							
								Marc Alexander 
							
						 
					 
					
						
						
							
						
						b2ada8ba09 
					 
					
						
						
							
							Merge branch '3.1.x'  
						
						... 
						
						
						
						Conflicts:
	phpBB/includes/mcp/mcp_main.php 
						
						
					 
					
						2015-06-09 15:24:08 +02:00 
						 
				 
			
				
					
						
							
							
								brunoais 
							
						 
					 
					
						
						
							
						
						1e45a05000 
					 
					
						
						
							
							[ticket/13685] Add phpbb_dispatcher to fulltext search constructors  
						
						... 
						
						
						
						PHPBB3-13685 
						
						
					 
					
						2015-06-07 18:40:44 +01:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						8a6e3f208a 
					 
					
						
						
							
							Merge branch '3.1.x'  
						
						... 
						
						
						
						* 3.1.x:
  [ticket/13719] Remove superfluous $search_options in acp_search. 
						
						
					 
					
						2015-03-23 09:43:43 -07:00 
						 
				 
			
				
					
						
							
							
								brunoais 
							
						 
					 
					
						
						
							
						
						754b5d6349 
					 
					
						
						
							
							[ticket/13719] Remove superfluous $search_options in acp_search.  
						
						... 
						
						
						
						PHPBB3-13719 
						
						
					 
					
						2015-03-23 12:58:05 +00:00 
						 
				 
			
				
					
						
							
							
								Gaëtan Muller 
							
						 
					 
					
						
						
							
						
						f6e06da4c6 
					 
					
						
						
							
							[ticket/13455] Update calls to request_var()  
						
						... 
						
						
						
						PHPBB3-13455 
						
						
					 
					
						2015-02-03 20:50:40 +01:00 
						 
				 
			
				
					
						
							
							
								Gaëtan Muller 
							
						 
					 
					
						
						
							
						
						79d4ff5538 
					 
					
						
						
							
							[ticket/13494] Update calls to set_config()  
						
						... 
						
						
						
						PHPBB3-13494 
						
						
					 
					
						2015-02-02 19:28:23 +01:00 
						 
				 
			
				
					
						
							
							
								Gaëtan Muller 
							
						 
					 
					
						
						
							
						
						7fc586080b 
					 
					
						
						
							
							[ticket/13468] Update calls to add_log()  
						
						... 
						
						
						
						PHPBB3-13468 
						
						
					 
					
						2015-01-27 18:34:33 +01:00 
						 
				 
			
				
					
						
							
							
								Gaëtan Muller 
							
						 
					 
					
						
						
							
						
						63da128ee5 
					 
					
						
						
							
							[ticket/12487] Update PHP code  
						
						... 
						
						
						
						PHPBB3-12487 
						
						
					 
					
						2015-01-11 13:22:59 +01:00 
						 
				 
			
				
					
						
							
							
								Yuriy Rusko 
							
						 
					 
					
						
						
							
						
						a759704b39 
					 
					
						
						
							
							[ticket/12594] Remove @package tags and update file headers  
						
						... 
						
						
						
						PHPBB3-12594 
						
						
					 
					
						2014-05-27 20:51:13 +02:00 
						 
				 
			
				
					
						
							
							
								Cesar G 
							
						 
					 
					
						
						
							
						
						e378037516 
					 
					
						
						
							
							[ticket/9388] Display only the settings for the selected search backend.  
						
						... 
						
						
						
						PHPBB3-9388 
						
						
					 
					
						2014-05-08 08:35:38 -07:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						7030578bbe 
					 
					
						
						
							
							[ticket/11698] Moving all autoloadable files to phpbb/  
						
						... 
						
						
						
						PHPBB3-11698 
						
						
					 
					
						2013-07-14 01:32:34 -04:00 
						 
				 
			
				
					
						
							
							
								Dhruv 
							
						 
					 
					
						
						
							
						
						794d6ec443 
					 
					
						
						
							
							[ticket/11011] pass $auth to search backend constructor  
						
						... 
						
						
						
						$auth global var is passed to search backend constructor, as it is used
by sphinx backend.
PHPBB3-11011 
						
						
					 
					
						2012-08-08 11:07:47 +05:30 
						 
				 
			
				
					
						
							
							
								Dhruv 
							
						 
					 
					
						
						
							
						
						2e218776bb 
					 
					
						
						
							
							[ticket/11011] passing global variables  
						
						... 
						
						
						
						Pass global variables to class constructor when making a new object.
PHPBB3-11011 
						
						
					 
					
						2012-07-28 18:28:51 +05:30 
						 
				 
			
				
					
						
							
							
								Dhruv Goel 
							
						 
					 
					
						
						
							
						
						0e9174d168 
					 
					
						
						
							
							[feature/sphinx-fulltext-search] use keywords_search instead of get_name  
						
						... 
						
						
						
						using keyword_search method instead of get_name to distinguish between the
search backend classes present in includes/search and other helper classes.
PHPBB3-10946 
						
						
					 
					
						2012-07-12 17:32:03 +05:30 
						 
				 
			
				
					
						
							
							
								Unknown 
							
						 
					 
					
						
						
							
						
						7a04c9048c 
					 
					
						
						
							
							[ticket/9916] Updating header license and removing Version $Id$  
						
						... 
						
						
						
						PHPBB3-9916 
						
						
					 
					
						2011-12-31 13:32:52 +00:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						179662e949 
					 
					
						
						
							
							[ticket/10345] Use the plural function in some more places.  
						
						... 
						
						
						
						I added two function avatar_explanation_string() and avatar_error_wrong_size()
for easier handling of the "pixels"-languages, as they are used quite often.
PHPBB3-10345 
						
						
					 
					
						2011-11-25 15:10:49 -05:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						5f48f55cca 
					 
					
						
						
							
							[feature/extension-manager] Removing now unused acp_search code  
						
						... 
						
						
						
						PHPBB3-10323 
						
						
					 
					
						2011-11-18 19:57:20 +01:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						0d296785b2 
					 
					
						
						
							
							[feature/extension-manager] Rename default methods to core methods on finder.  
						
						... 
						
						
						
						There are now extension_ and core_ methods for all finder settings as well as
a generic method which overwrites both.
PHPBB3-10323 
						
						
					 
					
						2011-11-18 16:44:42 +01:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						989bd9cde7 
					 
					
						
						
							
							[feature/extension-manager] Skip phpbb_search_base by checking for get_name()  
						
						... 
						
						
						
						PHPBB3-10323 
						
						
					 
					
						2011-09-29 15:42:40 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						dcc5ca5377 
					 
					
						
						
							
							[feature/extension-manager] Make search backends loadable from extensions  
						
						... 
						
						
						
						Search backends are now required to be autoloadable. The database updater to
3.1 tries to guess the class name as phpbb_search_<oldname> which works for
the default backends we ship.
PHPBB3-10323 
						
						
					 
					
						2011-09-29 15:42:40 +02:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						27fdcb4c7e 
					 
					
						
						
							
							[ticket/9684] Remove code in some more files especially includes/  
						
						... 
						
						
						
						Topic-Tracking is still missing.
PHPBB3-9684 
						
						
					 
					
						2011-04-07 13:47:06 +02:00 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						0e9b755667 
					 
					
						
						
							
							Merge branch 'develop-olympus' into develop  
						
						... 
						
						
						
						* develop-olympus:
  [ticket/9685] Buffer posts for search indexing when using mssqlnative. 
						
						
					 
					
						2011-03-15 02:00:04 +01:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						91b3195255 
					 
					
						
						
							
							[ticket/9685] Buffer posts for search indexing when using mssqlnative.  
						
						... 
						
						
						
						To have a generic solution there is now a sql_buffer_nested_transaction()
which indicates that the given SQL driver requires buffering to run a
transaction while iterating over another result set.
PHPBB3-9685 
						
						
					 
					
						2011-03-15 01:41:16 +01:00 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						442fc61be7 
					 
					
						
						
							
							Merge branch 'feature/igorw/request-class' into develop  
						
						... 
						
						
						
						* feature/igorw/request-class:
  [feature/request-class] Convert some remaining cookies
  [feature/request-class] Adjust misleading comment
  [feature/request-class] Remove direct access to _REQUEST in acp_search
  [feature/request-class] Special case of direct access to _REQUEST 
						
						
					 
					
						2010-12-16 02:22:17 +01:00 
						 
				 
			
				
					
						
							
							
								Igor Wiedler 
							
						 
					 
					
						
						
							
						
						af5b9a9640 
					 
					
						
						
							
							[ticket/9556] Drop php closing tags, add trailing newline  
						
						... 
						
						
						
						Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .
Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;
Extensions: php, css, html, js, xml.
PHPBB3-9556 
						
						
					 
					
						2010-11-11 19:10:55 +01:00 
						 
				 
			
				
					
						
							
							
								Igor Wiedler 
							
						 
					 
					
						
						
							
						
						30016a7084 
					 
					
						
						
							
							[feature/request-class] Remove direct access to _REQUEST in acp_search  
						
						... 
						
						
						
						PHPBB3-9716 
						
						
					 
					
						2010-10-17 13:55:45 +02:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						2e17e448de 
					 
					
						
						
							
							Copy 3.0.x branch to trunk  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@10211 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-10-04 18:14:59 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						2e4174da2a 
					 
					
						
						
							
							make search_indexing_state dynamic. This is related to bug  #44535  - although i think we only fix the symptoms and not the cause.  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9502 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-05-01 09:59:57 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						4d9b106db2 
					 
					
						
						
							
							New search option: Maximum number of words allowed to search for.  
						
						... 
						
						
						
						(the more words the more database load)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9438 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-04-11 11:09:45 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						68aa6bd29a 
					 
					
						
						
							
							put acp, mcp and ucp into modules/ directory  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@9223 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2008-12-24 14:08:15 +00:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						07e9b83a3d 
					 
					
						
						
							
							- updated all code to use the request class instead of any direct access to  
						
						... 
						
						
						
						super globals
- disabled super globals in common.php. See commit r9101 for
  more information
- cleaned up/simplified a few lines along the way.
git-svn-id: file:///svn/phpbb/trunk@9102 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2008-11-24 00:20:33 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						2f4a618900 
					 
					
						
						
							
							ok... i hope i haven't messed too much with the code and everything is still working.  
						
						... 
						
						
						
						Changes:
- Ascraeus now uses constants for the phpbb root path and the php extension. This ensures more security for external applications and modifications (no more overwriting of root path and extension possible through insecure mods and register globals enabled) as well as no more globalizing needed.
- A second change implemented here is an additional short-hand-notation for append_sid(). It is allowed to omit the root path and extension now (for example calling append_sid('memberlist')) - in this case the root path and extension get added automatically. The hook is called after these are added.
git-svn-id: file:///svn/phpbb/trunk@8572 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2008-05-29 12:25:56 +00:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						eaf97f2a67 
					 
					
						
						
							
							guess we need to initialise it first  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8405 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2008-02-26 17:13:21 +00:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						30b24d476c 
					 
					
						
						
							
							guess we need to initialise it first  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@8404 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2008-02-26 17:13:12 +00:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						f83b47bc11 
					 
					
						
						
							
							allow search backends to handle regular updates too, and not just backend switches  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@8403 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2008-02-25 18:39:16 +00:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						d6d2373582 
					 
					
						
						
							
							allow search backends to handle regular updates too, and not just backend switches  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8402 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2008-02-25 18:39:05 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						4b5fab372f 
					 
					
						
						
							
							merge with revision #r8350  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@8351 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2008-01-30 16:14:39 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						325ff1fa1b 
					 
					
						
						
							
							One commit for those fixes having a very tiny impact (mostly only whitespaces or forgotten spans, etc.)  
						
						... 
						
						
						
						Although i somehow mistakingly got #20445  and #15249  into it. :/
Removing s_watching_img from watch_topic_forum() function (Bug #20445 )
Changing order for post review if more than one post affected (Bug #15249 )
Language typos/fixes (Bug #20425 , #15719 , #15429 , #14669 , #13479 )
Style/Template fixes (Bug #20065 , #19405 , #19205 , #15028 , #14934 , #14821 , #14752 , #14497 , #13707 , #14738 )
Tiny code fixes (Bug #20165 , #20025 , #19795 , #14804 )
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8350 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2008-01-30 16:01:15 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						7de5bb3498 
					 
					
						
						
							
							dumdidum... sorry. ;)  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@8147 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-10-05 14:36:34 +00:00