Merge pull request #378 from fermionic/apparent-typo-in-function-name
my php thinks this is a typo
This commit is contained in:
		
				commit
				
					
						868e04f5eb
					
				
			
		
					 1 changed files with 1 additions and 1 deletions
				
			
		| 
						 | 
				
			
			@ -45,7 +45,7 @@ function diaspora2bb($s) {
 | 
			
		|||
//	$s = str_replace('*','*',$s);
 | 
			
		||||
 | 
			
		||||
	// protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands
 | 
			
		||||
	$s = str_replace('♲',html_entities_decode('♲',ENT_QUOTES,'UTF-8'),$s);
 | 
			
		||||
	$s = str_replace('♲',html_entity_decode('♲',ENT_QUOTES,'UTF-8'),$s);
 | 
			
		||||
 | 
			
		||||
	// Convert everything that looks like a link to a link
 | 
			
		||||
	$s = preg_replace("/([^\]\=]|^)(https?\:\/\/)([a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url=$2$3]$2$3[/url]',$s);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue