Andreas Fischer 
							
						 
					 
					
						
						
							
						
						8dcad17d1b 
					 
					
						
						
							
							Fix bug  #49215  - Use $phpEx variable instead of hardcoded '.php'  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9935 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-08-07 12:10:34 +00:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						ee65d2147b 
					 
					
						
						
							
							fix r9713 for  #36565  
						
						... 
						
						
						
						Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9931 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-08-05 15:28:46 +00:00 
						 
				 
			
				
					
						
							
							
								Henry Sudhof 
							
						 
					 
					
						
						
							
						
						1f871950d8 
					 
					
						
						
							
							#48985  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9916 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-08-03 15:46:56 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						e6f133dc55 
					 
					
						
						
							
							Revert r9878 - QR was already disabled by default, for admin convenience we enable the global setting but no local setting, which results in OFF by default  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9895 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-07-31 08:16:36 +00:00 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						1b8a1f73d7 
					 
					
						
						
							
							[Feature] Ability to copy permissions from one forum to several other forums.  
						
						... 
						
						
						
						[Fix] Add log entry when copying forum permissions.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9887 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-07-28 22:09:46 +00:00 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						b4f3a0eb2d 
					 
					
						
						
							
							Fix r9696,  #45115 . Move column change to the correct version.  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9886 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-07-28 21:33:31 +00:00 
						 
				 
			
				
					
						
							
							
								Henry Sudhof 
							
						 
					 
					
						
						
							
						
						fecc3383a2 
					 
					
						
						
							
							disable QR by default  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9878 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-07-28 11:26:55 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						4739c7ba39 
					 
					
						
						
							
							[Feature] Added new functionality to inactive users module:  
						
						... 
						
						
						
						- Ability to set users per page.
- Ability to sort by posts/number of reminders/last reminded date.
- Show number of posts and ability to search posts.
- Show number of reminders sent to user.
- Show date of last reminder sent to user.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9845 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-07-24 11:13:32 +00:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						54f78a50bc 
					 
					
						
						
							
							insert pm_reports module with correct basename on update  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9829 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-07-22 13:09:22 +00:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						6e4a7c03d1 
					 
					
						
						
							
							Users can report PMs to moderators which are then visible in a new MCP module  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9814 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-07-21 20:59:11 +00:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						0ee8d7ab15 
					 
					
						
						
							
							increase default maximum pass chars to 100  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9813 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-07-21 20:30:50 +00:00 
						 
				 
			
				
					
						
							
							
								Marek A. R 
							
						 
					 
					
						
						
							
						
						7a5ba35cc7 
					 
					
						
						
							
							- Add smilies per page config setting to the database updater  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9774 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-07-17 17:21:07 +00:00 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						ab9715a9fe 
					 
					
						
						
							
							Fix bugs  #46615  &  #46945  - Fail gracefully if store folder is not writable during update.  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9768 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-07-17 11:32:27 +00:00 
						 
				 
			
				
					
						
							
							
								Marek A. R 
							
						 
					 
					
						
						
							
						
						a777691994 
					 
					
						
						
							
							- Add pagination for icons and smilies in the ACP and smilies in the smiley popup  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9763 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-07-16 17:57:05 +00:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						e3866c939d 
					 
					
						
						
							
							Feature Bug  #43375  - Ability to delete warnings and keep warnings permanently  
						
						... 
						
						
						
						Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9758 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-07-14 20:35:53 +00:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						0b2979c6ba 
					 
					
						
						
							
							Feature Bug  #45375  - Add option to disable remote upload avatars  
						
						... 
						
						
						
						Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9757 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-07-14 20:25:41 +00:00 
						 
				 
			
				
					
						
							
							
								Jim Wigginton 
							
						 
					 
					
						
						
							
						
						7909b729bb 
					 
					
						
						
							
							unified the transfer routines from the updater and from acp_language.php. still needs work..  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@9751 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-07-12 15:44:43 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						26bb3bbb68 
					 
					
						
						
							
							print out error if users try to update phpBB versions no longer supported with the used database update script  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9743 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-07-09 13:28:25 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						55e15b4c8e 
					 
					
						
						
							
							Fix database updater and db tools to support multiple column changes/additions/removals with SQLite  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9735 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-07-08 13:52:18 +00:00 
						 
				 
			
				
					
						
							
							
								Henry Sudhof 
							
						 
					 
					
						
						
							
						
						aeac2819e3 
					 
					
						
						
							
							close the .4 array  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9710 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-06-30 14:49:54 +00:00 
						 
				 
			
				
					
						
							
							
								Ruslan Uzdenov 
							
						 
					 
					
						
						
							
						
						adaeec1ec9 
					 
					
						
						
							
							Fixed Bug  #45115  - Signature parsing flags are not stored in DB  
						
						... 
						
						
						
						Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9696 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-06-27 08:36:40 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						c32f49679f 
					 
					
						
						
							
							- add options for quick reply (forum-based and board-wide)  
						
						... 
						
						
						
						- add option for minimum post chars (which is a required setting for quick reply, therefore we introduce it here)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9656 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-06-23 10:48:53 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						926640fc75 
					 
					
						
						
							
							add missing user_new field to schema (just forgot to create it)  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9655 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-06-23 08:09:54 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						433de350c0 
					 
					
						
						
							
							- [Feature] New "Newly Registered Users" group for assigning permissions to newly registered users. They will be removed from this group once they reach a defineable amount of posts.  
						
						... 
						
						
						
						- [Feature] Ability to define if the "Newly Registered Users" group will be assigned as the default group to newly registered users.
As a coincidence also Bug #46535  got fixed.
Additionally the error message displayed with trigger_error() if accessing the private message tab in the ucp is now displayed inline in addition to a slightly different message for newly registered users to let them know that access permissions may be lifted over time.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9636 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-06-20 18:45:16 +00:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						d85a5ad036 
					 
					
						
						
							
							Fix bug  #46785  - Hide avatars if type disabled and give global option to turn on/off  
						
						... 
						
						
						
						Authorised by: acydburn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9632 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-06-19 22:03:19 +00:00 
						 
				 
			
				
					
						
							
							
								Henry Sudhof 
							
						 
					 
					
						
						
							
						
						5d9cf2aa41 
					 
					
						
						
							
							Make captchas stricter by oly having one entry per session; fix a bug in ucp_register that caused three captcha instances to be generated. Non-MySQL databases and garbage collecting needs extensive testing.  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9626 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-06-19 12:31:28 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						d7d96223e7 
					 
					
						
						
							
							- Display coloured usernames in ACP groups management screens  
						
						... 
						
						
						
						- Changed behaviour of group_create() function to support specifying additional group columns
- New groups option to excempt group leaders from group permissions
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9625 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-06-19 09:51:50 +00:00 
						 
				 
			
				
					
						
							
							
								Henry Sudhof 
							
						 
					 
					
						
						
							
						
						f32ca6c9bd 
					 
					
						
						
							
							#46515  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9592 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-06-14 15:47:35 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						e69fe56634 
					 
					
						
						
							
							- fix sql_column_exists for firebird (had same problem as oracle)  
						
						... 
						
						
						
						- fix sql_column_change for firebird (interbase6 only supports TYPE and SET DEFAULT, but not the same syntax ass ADD COLUMN)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9586 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-06-13 16:04:54 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						8d4ddc3b23 
					 
					
						
						
							
							erm, we need to check if the feed module is already there  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9584 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-06-13 14:55:30 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						d843dbd046 
					 
					
						
						
							
							Fix sql_column_exists for oracle (oracle uses uppercase table names)  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9583 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-06-13 14:48:45 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						863d7a7614 
					 
					
						
						
							
							First ATOM Feed commit/integration  
						
						... 
						
						
						
						- Idea and original RSS Feed 2.0 MOD (Version 1.0.8/9) by leviatan21
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9575 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-06-12 14:41:03 +00:00 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						9f21f1ab5e 
					 
					
						
						
							
							Fix bug  #44665  - Add index on log_time to the log table to prevent slowdown on boards with many log entries.  
						
						... 
						
						
						
						Authorised by: acydburn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9564 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-06-08 12:36:26 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						a539fca62b 
					 
					
						
						
							
							some corrections, only very minor things.  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9554 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-06-07 11:34:01 +00:00 
						 
				 
			
				
					
						
							
							
								Chris Smith 
							
						 
					 
					
						
						
							
						
						62aa26c9a6 
					 
					
						
						
							
							- Stop people messing around  #45935  
						
						... 
						
						
						
						- Ensure the Accept-Language header actually picks up a directory.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9527 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-06-02 22:12:37 +00:00 
						 
				 
			
				
					
						
							
							
								Henry Sudhof 
							
						 
					 
					
						
						
							
						
						b776d02682 
					 
					
						
						
							
							Okay, a first ci of the new captcha plugins. We'll add dynamic template includes later, as well as documentation on how to use this. I'm prepared to get yelled at for bugs (oh, I know that there are plenty); but please blame spammers for broken styles and MODs.  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9524 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-06-02 14:12:23 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						4a36fe5264 
					 
					
						
						
							
							update version number  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9521 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-05-31 10:46:40 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						8037937eb8 
					 
					
						
						
							
							late fix for  #45335  (incorrect log message for update if using old updater)  
						
						... 
						
						
						
						late fix committed because change does not effect update files or patch
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9517 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-05-19 11:19:06 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						6c3532761b 
					 
					
						
						
							
							slight change for 3.0.5 for updating.  
						
						... 
						
						
						
						- only return auth options having 2 or more columns (does not change the outcome, the script works fine)
- purge the theme after a successful update the easy way to let style.php do the job
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9510 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-05-06 08:38:30 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						864c634060 
					 
					
						
						
							
							Set new version...  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9503 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-05-01 10:06:41 +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 
							
						 
					 
					
						
						
							
						
						ab122983f7 
					 
					
						
						
							
							Fix column handling in db updater, custom profile fields an db tools for firebird DBMS (Bug  #44555 )  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9492 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-04-28 11:18:02 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						1042152a55 
					 
					
						
						
							
							Merge changes made in revisions #r9405 to #r9467  
						
						... 
						
						
						
						2009-04-18
git-svn-id: file:///svn/phpbb/trunk@9468 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-04-18 15:09:19 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						83ed73c9b4 
					 
					
						
						
							
							fix forum_style column. :/ Bug  #38905  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9455 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-04-17 13:16:20 +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 
							
						 
					 
					
						
						
							
						
						cda9e5e9ec 
					 
					
						
						
							
							a language alteration for captchas.  
						
						... 
						
						
						
						Added min/max captcha chars constants and changed the length from 5-8 to 4-7
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9437 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-04-11 09:11:08 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						1fae177b9a 
					 
					
						
						
							
							Fix bug in postgresql db layer for LIMIT ALL clauses (reported by JRSweets)  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9412 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-03-30 10:44:18 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						d75616c717 
					 
					
						
						
							
							unfortunately we are not able to use db_tools - because we do not know the state it is in, therefore can't rely on it.  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9405 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-03-24 12:24:55 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						4cbf6bc703 
					 
					
						
						
							
							Merge most changes from 3.0.x branch since the 25th december.  
						
						... 
						
						
						
						(Captcha changes for refreshing captcha image not included)
git-svn-id: file:///svn/phpbb/trunk@9404 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-03-22 16:34:26 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						0f162568f2 
					 
					
						
						
							
							Fix duplicate creation of acl options in acl_add_options() under certain conditions. (Bug  #38385 ,  #40225 )  
						
						... 
						
						
						
						Add unique key to ACL options table to prevent duplicate permission options. (Bug #41835 )
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9400 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-03-20 13:22:19 +00:00