Friendica/friendica
Friendica/friendica
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica.git synced 2025-06-17 04:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/develop' into 1602-gcontact-cleanup

Browse source
This commit is contained in:
Michael Vogel 2016-02-13 20:12:31 +01:00
commit 9261154eab
483 changed files with 23212 additions and 10894 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mod/help.php
View file

@ -62,7 +62,7 @@ function help_content(&$a) {
if ($filename !== "Home") {
// create TOC but not for home
$lines = explode("\n", $html);
$toc="<style>aside ul {padding-left: 1em;}</style><h2>TOC</h2><ul id='toc'>";
$toc="<style>aside ul {padding-left: 1em;}aside h1{font-size:2em}</style><h2>TOC</h2><ul id='toc'>";
$lastlevel=1;
$idnum = array(0,0,0,0,0,0,0);
foreach($lines as &$line){
@ -84,7 +84,7 @@ function help_content(&$a) {
}
}
}
for($k=1;$k<$lastlevel; $k++) $toc.="</ul>";
for($k=0;$k<$lastlevel; $k++) $toc.="</ul>";
$html = implode("\n",$lines);
$a->page['aside'] = $toc.$a->page['aside'];

18
mod/ping.php
View file

@ -219,19 +219,21 @@ function ping_init(&$a) {
<home>$home</home>\r\n";
if ($register!=0) echo "<register>$register</register>";
if ( count($groups_unseen) ) {
if (count($groups_unseen)) {
echo '<groups>';
foreach ($groups_unseen as $it) {
echo '<group id="' . $it['id'] . '">' . $it['count'] . "</group>";
}
foreach ($groups_unseen as $it)
if ($it['count'] > 0)
echo '<group id="'.$it['id'].'">'.$it['count']."</group>";
echo "</groups>";
}
if ( count($forums_unseen) ) {
if (count($forums_unseen)) {
echo '<forums>';
foreach ($forums_unseen as $it) {
echo '<forum id="' . $it['id'] . '">' . $it['count'] . "</forum>";
}
foreach ($forums_unseen as $it)
if ($it['count'] > 0)
echo '<forum id="'.$it['id'].'">'.$it['count']."</forum>";
echo "</forums>";
}