Nils Adermann 
							
						 
					 
					
						
						
							
						
						e2046444a1 
					 
					
						
						
							
							Merge branch 'develop-olympus' into develop  
						
						... 
						
						
						
						* develop-olympus:
  [ticket/11361] Make sure that array passed to strtr() has the proper format.
Conflicts:
	phpBB/includes/session.php 
						
						
					 
					
						2013-02-24 17:58:27 +01:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						a71e60cdbd 
					 
					
						
						
							
							[feature/new-tz-handling] Rename $user->tz back to $user->timezone  
						
						... 
						
						
						
						PHPBB3-9558 
						
						
					 
					
						2012-07-18 16:52:52 +02:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						f5bb145040 
					 
					
						
						
							
							[feature/new-tz-handling] Require user argument on phpbb_datetime  
						
						... 
						
						
						
						PHPBB3-9558 
						
						
					 
					
						2012-07-16 18:29:31 +02:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						82e195ac68 
					 
					
						
						
							
							[feature/new-tz-handling] Fix code and doc layout  
						
						... 
						
						
						
						PHPBB3-9558 
						
						
					 
					
						2012-06-20 14:34:35 +02:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						a613caab09 
					 
					
						
						
							
							[feature/new-tz-handling] Trim comment length and remove leading underscores  
						
						... 
						
						
						
						PHPBB3-9558 
						
						
					 
					
						2012-06-19 19:24:03 +02:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						2c4677b79e 
					 
					
						
						
							
							[feature/new-tz-handling] Remove function getTimestamp() as we require php 5.3  
						
						... 
						
						
						
						PHPBB3-9558 
						
						
					 
					
						2012-06-18 15:10:50 +02:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						fb77b6b70c 
					 
					
						
						
							
							[feature/new-tz-handling] Fix documentation in includes/datetime.php  
						
						... 
						
						
						
						PHPBB3-9558 
						
						
					 
					
						2012-06-18 15:10:40 +02:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						2a880dafdf 
					 
					
						
						
							
							[feature/new-tz-handling] Do not use underscore as prefix for user  
						
						... 
						
						
						
						PHPBB3-9558 
						
						
					 
					
						2012-06-18 15:10:22 +02:00 
						 
				 
			
				
					
						
							
							
								Chris Smith 
							
						 
					 
					
						
						
							
						
						f17664a00c 
					 
					
						
						
							
							[feature/new-tz-handling] Correct a bug preventing multiple formats working.  
						
						... 
						
						
						
						PHPBB3-9558 
						
						
					 
					
						2012-03-14 22:57:30 -04:00 
						 
				 
			
				
					
						
							
							
								Chris Smith 
							
						 
					 
					
						
						
							
						
						6e1278655f 
					 
					
						
						
							
							[feature/new-tz-handling] Removed line that was missed in cc312d8.  
						
						... 
						
						
						
						PHPBB3-9558 
						
						
					 
					
						2012-03-14 22:57:30 -04:00 
						 
				 
			
				
					
						
							
							
								Chris Smith 
							
						 
					 
					
						
						
							
						
						e9fe9ea518 
					 
					
						
						
							
							[feature/new-tz-handling] Fix bug from 3.0 formatting future dates.  
						
						... 
						
						
						
						Future dates can get formatted as 'less than a minute ago' if they
occur in the future on the same minute as the current minute.
PHPBB3-9558 PHPBB3-9712 
						
						
					 
					
						2012-03-14 22:57:30 -04:00 
						 
				 
			
				
					
						
							
							
								Chris Smith 
							
						 
					 
					
						
						
							
						
						5dd7916c49 
					 
					
						
						
							
							[feature/new-tz-handling] Check the is_short flag stored inside the format array.  
						
						... 
						
						
						
						Reuse the existing check store in the format array to determine if the date time
format supports relative formatting.
PHPBB3-9558 
						
						
					 
					
						2012-03-14 22:57:30 -04:00 
						 
				 
			
				
					
						
							
							
								Chris Smith 
							
						 
					 
					
						
						
							
						
						8fe46175af 
					 
					
						
						
							
							[feature/new-tz-handling] Fix undefined variable.  
						
						... 
						
						
						
						PHPBB3-9558 
						
						
					 
					
						2012-03-14 22:57:30 -04:00 
						 
				 
			
				
					
						
							
							
								Chris Smith 
							
						 
					 
					
						
						
							
						
						f085735ef8 
					 
					
						
						
							
							[feature/new-tz-handling] Explained name of phpbb_datetime::getTimestamp()  
						
						... 
						
						
						
						phpbb_datetime::getTimestamp() exists purely to support PHP 5.2 which
does not implement the method.
PHPBB3-9558 
						
						
					 
					
						2012-03-14 22:57:30 -04:00 
						 
				 
			
				
					
						
							
							
								Chris Smith 
							
						 
					 
					
						
						
							
						
						dba89a5341 
					 
					
						
						
							
							[feature/new-tz-handling] Added phpbb_datetime::__toString().  
						
						... 
						
						
						
						New phpbb_datetime::__toString() magic method that formats the datetime
according to the users default settings.
PHPBB3-9558 
						
						
					 
					
						2012-03-14 22:57:29 -04:00 
						 
				 
			
				
					
						
							
							
								Chris Smith 
							
						 
					 
					
						
						
							
						
						c521ef1591 
					 
					
						
						
							
							[feature/new-tz-handling] Comment and optimise phpbb_datetime::format().  
						
						... 
						
						
						
						- Added comments explaining the complex time computations for rendering
  relative date times.
- Replaced some repeated method invokations with variables.
PHPBB3-9558 
						
						
					 
					
						2012-03-14 22:57:29 -04:00 
						 
				 
			
				
					
						
							
							
								Chris Smith 
							
						 
					 
					
						
						
							
						
						522f65d079 
					 
					
						
						
							
							[feature/new-tz-handling] Correct typo in member comment.  
						
						... 
						
						
						
						PHPBB3-9558 
						
						
					 
					
						2012-03-14 22:57:29 -04:00 
						 
				 
			
				
					
						
							
							
								Chris Smith 
							
						 
					 
					
						
						
							
						
						a5c3ff3769 
					 
					
						
						
							
							[feature/new-tz-handling] Renamed old variables and removed extra conditional.  
						
						... 
						
						
						
						PHPBB3-9558 
						
						
					 
					
						2012-03-14 22:57:29 -04:00 
						 
				 
			
				
					
						
							
							
								Chris Smith 
							
						 
					 
					
						
						
							
						
						e8b60fc3d8 
					 
					
						
						
							
							[feature/new-tz-handling] Use phpbb_datetime rather than phpbb_DateTime.  
						
						... 
						
						
						
						PHPBB3-9558 
						
						
					 
					
						2012-03-14 22:57:29 -04:00 
						 
				 
			
				
					
						
							
							
								Chris Smith 
							
						 
					 
					
						
						
							
						
						6f7d095e3f 
					 
					
						
						
							
							[feature/new-tz-handling] Wrapper around DateTime for new date time handling.  
						
						... 
						
						
						
						Wrapped PHP's DateTime with some extensions for supporting phpBB's relative
date formats and provided the DateTime::getTimestamp() method to PHP < 5.3.
PHPBB3-9558 
						
						
					 
					
						2012-03-14 22:57:28 -04:00