From 32aef838f8317ef908f50c02c2edd4a6fa9ee012 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 23 Feb 2013 01:27:43 -0800
Subject: allow embedded content via ajax on page load

---
 mod/update_channel.php | 20 +++++++++++---------
 mod/update_display.php | 13 +++++++------
 mod/update_network.php | 21 +++++++++++----------
 version.inc            |  2 +-
 4 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/mod/update_channel.php b/mod/update_channel.php
index 19226297b..bdde0a3be 100644
--- a/mod/update_channel.php
+++ b/mod/update_channel.php
@@ -39,15 +39,17 @@ function update_channel_content(&$a) {
 	$replace = "<img\${1} dst=\"\${2}\"";
 	$text = preg_replace($pattern, $replace, $text);
 
-	$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
-	$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
-	$text = preg_replace($pattern, $replace, $text);
-	$pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
-	$text = preg_replace($pattern, $replace, $text);
-	$pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i";
-	$text = preg_replace($pattern, $replace, $text);
-    $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
-    $text = preg_replace($pattern, $replace, $text);
+	if(! $load) {
+		$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
+		$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
+		$text = preg_replace($pattern, $replace, $text);
+		$pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
+		$text = preg_replace($pattern, $replace, $text);
+		$pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i";
+		$text = preg_replace($pattern, $replace, $text);
+    	$pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
+    	$text = preg_replace($pattern, $replace, $text);
+	}
 
 	/**
 	 * reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well
diff --git a/mod/update_display.php b/mod/update_display.php
index c8eb9c3a3..5802852bb 100644
--- a/mod/update_display.php
+++ b/mod/update_display.php
@@ -16,11 +16,12 @@ function update_display_content(&$a) {
 	echo (($_GET['msie'] == 1) ? '<div>' : '<section>');
 
 
-        $text = display_content($a,$profile_uid, $load);
-        $pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
-        $replace = "<img\${1} dst=\"\${2}\"";
-        $text = preg_replace($pattern, $replace, $text);
+	$text = display_content($a,$profile_uid, $load);
+	$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
+	$replace = "<img\${1} dst=\"\${2}\"";
+	$text = preg_replace($pattern, $replace, $text);
 
+	if(! $load) {
 		$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
         $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
         $text = preg_replace($pattern, $replace, $text);
@@ -30,9 +31,9 @@ function update_display_content(&$a) {
         $text = preg_replace($pattern, $replace, $text);
         $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
         $text = preg_replace($pattern, $replace, $text);
+	}
 
-
-        echo str_replace("\t",'       ',$text);
+	echo str_replace("\t",'       ',$text);
 	echo (($_GET['msie'] == 1) ? '</div>' : '</section>');
 	echo "</body></html>\r\n";
 //	logger('update_display: ' . $text);
diff --git a/mod/update_network.php b/mod/update_network.php
index 16de19365..bb6245f65 100644
--- a/mod/update_network.php
+++ b/mod/update_network.php
@@ -19,16 +19,17 @@ function update_network_content(&$a) {
         $replace = "<img\${1} dst=\"\${2}\"";
         $text = preg_replace($pattern, $replace, $text);
 
-		$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
-        $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
-        $text = preg_replace($pattern, $replace, $text);
-        $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
-        $text = preg_replace($pattern, $replace, $text);
-        $pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i";
-        $text = preg_replace($pattern, $replace, $text);
-        $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
-        $text = preg_replace($pattern, $replace, $text);
-
+		if(! $load) {
+			$replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
+    	    $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
+        	$text = preg_replace($pattern, $replace, $text);
+	        $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i";
+    	    $text = preg_replace($pattern, $replace, $text);
+        	$pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i";
+	        $text = preg_replace($pattern, $replace, $text);
+    	    $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i";
+        	$text = preg_replace($pattern, $replace, $text);
+		}
 
         echo str_replace("\t",'       ',$text);
 	echo (($_GET['msie'] == 1) ? '</div>' : '</section>');
diff --git a/version.inc b/version.inc
index 94aae2070..6f0d33522 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-02-21.231
+2013-02-23.233
-- 
cgit v1.2.3