Merge pull request fossar#826 from lumiru/patch-3

Fix encoding problems caused by camo
niol · Dec 19, 2016 · 90fdba0 · 90fdba0
2 parents bfb2b20 + 9440626
commit 90fdba0
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/helpers/ViewHelper.php b/helpers/ViewHelper.php
@@ -83,16 +83,9 @@ public function camoflauge($content)
         }
 
         $camo = new \WillWashburn\Phpamo\Phpamo(\F3::get('camo_key'), \F3::get('camo_domain'));
-        $dom = new \DOMDocument();
-        $dom->loadHTML($content);
 
-        foreach ($dom->getElementsByTagName('img') as $item) {
-            if ($item->hasAttribute('src')) {
-                $src = $item->getAttribute('src');
-                $item->setAttribute('src', $camo->camoHttpOnly($src));
-            }
-        }
-
-        return $dom->saveHTML();
+        return preg_replace_callback("/<img([^<]+)src=(['\"])([^\"']*)(['\"])([^<]*)>/i", function($matches) use ($camo) {
+            return '<img' . $matches[1] . 'src=' . $matches[2] . $camo->camoHttpOnly($matches[3]) . $matches[4] . $matches[5] . '>';
+        }, $content);
     }
 }