undo the disabling of browser_prefetch and for the time being revert the HTML cache until we can isolate all the zid and observer calls. Also get rid of youtube and vimeo bbcode tags which we should not be using any more.

7 files changed, 7 insertions, 7 deletions

diff --git a/mod/directory.php b/mod/directory.php
index fa328462c..5220c1e3e 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -244,7 +244,7 @@ function directory_content(&$a) {
 
 						$hometown = ((x($profile,'hometown') == 1) ? $profile['hometown']  : False);
 
-						$about = ((x($profile,'about') == 1) ? bbcode(strip_bbimage($profile['about'])) : False);
+						$about = ((x($profile,'about') == 1) ? bbcode($profile['about']) : False);
 
 						$keywords = ((x($profile,'keywords')) ? $profile['keywords'] : '');
 
diff --git a/mod/update_channel.php b/mod/update_channel.php
index bdde0a3be..5f4436d59 100644
--- a/mod/update_channel.php
+++ b/mod/update_channel.php
@@ -37,7 +37,7 @@ function update_channel_content(&$a) {
 
 	$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
 	$replace = "<img\${1} dst=\"\${2}\"";
-	$text = preg_replace($pattern, $replace, $text);
+//	$text = preg_replace($pattern, $replace, $text);
 
 	if(! $load) {
 		$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
diff --git a/mod/update_display.php b/mod/update_display.php
index 5802852bb..d41e2e5cb 100644
--- a/mod/update_display.php
+++ b/mod/update_display.php
@@ -19,7 +19,7 @@ function update_display_content(&$a) {
 	$text = display_content($a,$profile_uid, $load);
 	$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
 	$replace = "<img\${1} dst=\"\${2}\"";
-	$text = preg_replace($pattern, $replace, $text);
+//	$text = preg_replace($pattern, $replace, $text);
 
 	if(! $load) {
 		$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
diff --git a/mod/update_home.php b/mod/update_home.php
index c139682e1..80ae2438f 100644
--- a/mod/update_home.php
+++ b/mod/update_home.php
@@ -15,7 +15,7 @@ function update_home_content(&$a) {
         $text = home_content($a,$profile_uid, $load);
         $pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
         $replace = "<img\${1} dst=\"\${2}\"";
-        $text = preg_replace($pattern, $replace, $text);
+//        $text = preg_replace($pattern, $replace, $text);
 
 		if(! $load) {
 			$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
diff --git a/mod/update_network.php b/mod/update_network.php
index 0021af876..acd5ccdc8 100644
--- a/mod/update_network.php
+++ b/mod/update_network.php
@@ -17,7 +17,7 @@ function update_network_content(&$a) {
         $text = network_content($a,$profile_uid, $load);
         $pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
         $replace = "<img\${1} dst=\"\${2}\"";
-        $text = preg_replace($pattern, $replace, $text);
+//        $text = preg_replace($pattern, $replace, $text);
 
 		if(! $load) {
 			$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
diff --git a/mod/update_public.php b/mod/update_public.php
index d0a08e0e6..bac1ccf15 100644
--- a/mod/update_public.php
+++ b/mod/update_public.php
@@ -15,7 +15,7 @@ function update_public_content(&$a) {
         $text = public_content($a,$profile_uid, $load);
         $pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
         $replace = "<img\${1} dst=\"\${2}\"";
-        $text = preg_replace($pattern, $replace, $text);
+//        $text = preg_replace($pattern, $replace, $text);
 
 		if(! $load) {
 			$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
diff --git a/mod/update_search.php b/mod/update_search.php
index ec7599b79..de29e89bd 100644
--- a/mod/update_search.php
+++ b/mod/update_search.php
@@ -40,7 +40,7 @@ function update_search_content(&$a) {
 
 	$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
 	$replace = "<img\${1} dst=\"\${2}\"";
-	$text = preg_replace($pattern, $replace, $text);
+//	$text = preg_replace($pattern, $replace, $text);
 
 	if(! $load) {
 		$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';