mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-11-03 21:47:32 -05:00 
			
		
		
		
	Merge fix for #800
This commit is contained in:
		
							parent
							
								
									8dd9e99112
								
							
						
					
					
						commit
						4fe3887468
					
				@ -948,7 +948,7 @@ class Account extends Eloquent
 | 
				
			|||||||
            // Add line breaks if HTML isn't already being used
 | 
					            // Add line breaks if HTML isn't already being used
 | 
				
			||||||
            return strip_tags($this->email_footer) == $this->email_footer ? nl2br($this->email_footer) : $this->email_footer;
 | 
					            return strip_tags($this->email_footer) == $this->email_footer ? nl2br($this->email_footer) : $this->email_footer;
 | 
				
			||||||
        } else {
 | 
					        } else {
 | 
				
			||||||
            return "<p>" . trans('texts.email_signature') . "\n<br>\$account</ p>";
 | 
					            return "<p>" . trans('texts.email_signature') . "\n<br>\$account</p>";
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user