don't send any potentially large embeds over ajax so as to avoid huge prefetch downlo...

diff --git a/include/main.js b/include/main.js
index e3e56fa0b44f67f6bad494bec06cdeaa4fd511b8..0d68c2b2b30177a2e28d8c71b0d3cc7b28a27453 100644 (file)
--- a/include/main.js
+++ b/include/main.js
@@ -138,7 +138,7 @@
                        });
                        $('.wall-item-outside-wrapper',data).each(function() {
                                var ident = $(this).attr('id');
-                               if($('#' + ident).length == 0) { 
+                               if($('#' + ident).length == 0) {
                                        $('img',this).each(function() {
                                                $(this).attr('src',$(this).attr('dst'));
                                        });

diff --git a/mod/update_network.php b/mod/update_network.php
index cf9f11f586f734d4967a12fbd2c094ac5e39549c..f9914abc284f21be913c0fadc01a5a1047546792 100644 (file)
--- a/mod/update_network.php
+++ b/mod/update_network.php
@@ -19,6 +19,15 @@ 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);
+
+
         echo str_replace("\t",'       ',$text);
        echo (($_GET['msie'] == 1) ? '</div>' : '</section>');
        echo "</body></html>\r\n";

diff --git a/mod/update_profile.php b/mod/update_profile.php
index 13c519d1c10f1104caa25302eb98196a58ccdaaa..40ee33325bc262c90246071927fbf9ea0ee425aa 100644 (file)
--- a/mod/update_profile.php
+++ b/mod/update_profile.php
@@ -38,6 +38,14 @@ function update_profile_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);
+
        /**
         * reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well
         */