Merge pull request #616 from fabrixxm/master

[friendica.git] / include / html2plain.php

diff --git a/include/html2plain.php b/include/html2plain.php
index 839dd70a74437383a01ccdec34bbcad0d66506a7..572f9714a32162f2ffc1504aab4708df4b6600f0 100644 (file)
--- a/include/html2plain.php
+++ b/include/html2plain.php
@@ -1,5 +1,5 @@
 <?php
-require_once "html2bbcode.php";
+require_once("include/html2bbcode.php");
 
 function breaklines($line, $level, $wraplength = 75)
 {
@@ -92,6 +92,9 @@ function collecturls($message) {
                if ((strpos($treffer[1], "//plus.google.com/") !== false) and (strpos($treffer[1], "/posts") !== false))
                                $ignore = false;
 
+               if ((strpos($treffer[1], "//plus.google.com/") !== false) and (strpos($treffer[1], "/photos") !== false))
+                               $ignore = false;
+
                if (!$ignore)
                        $urls[$treffer[1]] = $treffer[1];
        }
@@ -206,7 +209,7 @@ function html2plain($html, $wraplength = 75, $compact = false)
        if (!$compact) {
                $counter = 1;
                foreach ($urls as $id=>$url)
-                       if (strpos($message, $url) == false)
+                       if (strpos($message, $url) === false)
                                $message .= "\n".$url." ";
                                //$message .= "\n[".($counter++)."] ".$url;
        }