audio/video bb tags showing up on Diaspora
This commit is contained in:
		
							
								
								
									
										2
									
								
								boot.php
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								boot.php
									
									
									
									
									
								
							| @@ -9,7 +9,7 @@ require_once('include/nav.php'); | ||||
| require_once('include/cache.php'); | ||||
|  | ||||
| define ( 'FRIENDICA_PLATFORM',     'Friendica'); | ||||
| define ( 'FRIENDICA_VERSION',      '2.3.1200' ); | ||||
| define ( 'FRIENDICA_VERSION',      '2.3.1201' ); | ||||
| define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    ); | ||||
| define ( 'DB_UPDATE_VERSION',      1112      ); | ||||
|  | ||||
|   | ||||
| @@ -173,9 +173,9 @@ function bb2diaspora($Text,$preserve_nl = false) { | ||||
|  | ||||
| 	// html5 video and audio | ||||
|  | ||||
| //	$Text = preg_replace("/\[video\](.*?)\[\/video\]/", '<video src="$1" controls="controls" width="425" height="350"><a href="$1">$1</a></video>', $Text); | ||||
| 	$Text = preg_replace("/\[video\](.*?)\[\/video\]/", '$1', $Text); | ||||
|  | ||||
| //	$Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text); | ||||
| 	$Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '$1', $Text); | ||||
|  | ||||
| //	$Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/", '<iframe src="$1" width="425" height="350"><a href="$1">$1</a></iframe>', $Text); | ||||
|           | ||||
|   | ||||
| @@ -194,6 +194,7 @@ ACL.prototype.update_view = function(){ | ||||
| 					uclass="grouphide"; | ||||
| 				} | ||||
|  | ||||
|  | ||||
| 				$(that.group_uids[id]).each(function(i,v){ | ||||
| 					$("#c"+v).removeClass("groupshow grouphide").addClass(uclass); | ||||
| 				}); | ||||
| @@ -208,6 +209,8 @@ ACL.prototype.update_view = function(){ | ||||
| 					btshow.removeClass("selected"); | ||||
| 					bthide.addClass("selected"); | ||||
| 				}			 | ||||
| 			default: | ||||
| 				break; | ||||
| 		} | ||||
| 		 | ||||
| 	}); | ||||
|   | ||||
| @@ -60,8 +60,8 @@ function acl_init(&$a){ | ||||
| 			intval($count) | ||||
| 		); | ||||
|  | ||||
| 		 | ||||
| 		foreach($r as $g){ | ||||
| //		logger('acl: group: ' . $g['name'] . ' members: ' . $g['uids']);		 | ||||
| 			$groups[] = array( | ||||
| 				"type"  => "g", | ||||
| 				"photo" => "images/default-group-mm.png", | ||||
|   | ||||
		Reference in New Issue
	
	Block a user