Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 04:40:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoiding some PHP warnings

Browse source
This commit is contained in:
Michael Vogel 2014-03-09 09:26:54 +01:00
parent 7cec1bbfdf
commit 9f4ef7c105
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/html2plain.php
View file

@ -221,9 +221,10 @@ function html2plain($html, $wraplength = 75, $compact = false)
if (!$compact AND ($message != "")) { if (!$compact AND ($message != "")) {
$counter = 1; $counter = 1;
foreach ($urls as $id=>$url) foreach ($urls as $id=>$url)
if (strpos($message, $url) === false) if ($url != "")
$message .= "\n".$url." "; if (strpos($message, $url) === false)
//$message .= "\n[".($counter++)."] ".$url; $message .= "\n".$url." ";
//$message .= "\n[".($counter++)."] ".$url;
} }
$message = str_replace("\n«", "«\n", $message); $message = str_replace("\n«", "«\n", $message);

10
object/Item.php
View file

@ -269,22 +269,22 @@ class Item extends BaseObject {
} }
// Disable features that aren't available in several networks // Disable features that aren't available in several networks
if ($item["item_network"] != "dfrn") { if (($item["item_network"] != "dfrn") AND isset($buttons["dislike"])) {
unset($buttons["dislike"]); unset($buttons["dislike"]);
$tagger = ''; $tagger = '';
} }
if ($item["item_network"] == "feed") if (($item["item_network"] == "feed") AND isset($buttons["like"]))
unset($buttons["like"]); unset($buttons["like"]);
if ($item["item_network"] == "mail") if (($item["item_network"] == "mail") AND isset($buttons["like"]))
unset($buttons["like"]); unset($buttons["like"]);
if (($item["item_network"] == "dspr") AND ($indent == 'comment')) if (($item["item_network"] == "dspr") AND ($indent == 'comment') AND isset($buttons["like"]))
unset($buttons["like"]); unset($buttons["like"]);
// Facebook can like comments - but it isn't programmed in the connector yet. // Facebook can like comments - but it isn't programmed in the connector yet.
if (($item["item_network"] == "face") AND ($indent == 'comment')) if (($item["item_network"] == "face") AND ($indent == 'comment') AND isset($buttons["like"]))
unset($buttons["like"]); unset($buttons["like"]);