Merge remote-tracking branch 'upstream/master'

[friendica-addons.git] / statusnet / statusnet.php

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 2c9795403f9c638a211e136de64c78fe025fb008..b16dedf846144dcbd350b8dbe623cb1fb4ac35b6 100755 (executable)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -391,7 +391,7 @@ function statusnet_settings(&$a,&$s) {
                        $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . t('Submit') . '" /></div>'; 
                }
        }
-        $s .= '</div><div class="clear"></div></div>';
+        $s .= '</div><div class="clear"></div>';
 }
 
 
@@ -548,7 +548,7 @@ function statusnet_shortenmsg($b, $max_char) {
                $msglink = $b["plink"];
 
        // If the message is short enough then don't modify it. (if the link exists in the original message)
-       if ((strlen(trim($origmsg)) <= $max_char) AND (strpos($origmsg, $msglink) OR ($msglink == "")))
+       if ((strlen(trim($origmsg)) <= $max_char) AND (($msglink == "") OR strpos($origmsg, $msglink)))
                return(array("msg"=>trim($origmsg), "image"=>""));
 
        // If the message is short enough and contains a picture then post the picture as well