aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorAlexander Kampmann <programmer@nurfuerspam.de>2012-03-09 12:17:19 +0100
committerAlexander Kampmann <programmer@nurfuerspam.de>2012-03-09 12:17:19 +0100
commitaf34cf019c5742abadab19586f3931353d8d3ff8 (patch)
treee788b55ff2bbe256d62e517d04ef25e8630313b3 /mod
parentf84c191f8df126b95d8a41f70e785a9592018390 (diff)
parent42d622d6bfb5768205573cb6b149340d28f46886 (diff)
downloadvolse-hubzilla-af34cf019c5742abadab19586f3931353d8d3ff8.tar.gz
volse-hubzilla-af34cf019c5742abadab19586f3931353d8d3ff8.tar.bz2
volse-hubzilla-af34cf019c5742abadab19586f3931353d8d3ff8.zip
Merge branch 'master' of git://github.com/friendica/friendica
Diffstat (limited to 'mod')
-rwxr-xr-xmod/contacts.php7
-rwxr-xr-xmod/message.php6
-rwxr-xr-xmod/network.php2
3 files changed, 11 insertions, 4 deletions
diff --git a/mod/contacts.php b/mod/contacts.php
index c99ac1452..001bf12af 100755
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -447,9 +447,10 @@ function contacts_content(&$a) {
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ",
intval($_SESSION['uid']));
- if(count($r))
+ if(count($r)) {
$a->set_pager_total($r[0]['total']);
-
+ $total = $r[0]['total'];
+ }
@@ -518,7 +519,7 @@ function contacts_content(&$a) {
$o .= replace_macros($tpl,array(
'$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
'$tabs' => $t,
- '$total' => $r[0]['total'],
+ '$total' => $total,
'$search' => $search_hdr,
'$desc' => t('Search your contacts'),
'$finding' => (strlen($search) ? t('Finding: ') . "'" . $search . "'" : ""),
diff --git a/mod/message.php b/mod/message.php
index 4b494e906..91db5baef 100755
--- a/mod/message.php
+++ b/mod/message.php
@@ -129,10 +129,16 @@ function message_content(&$a) {
$o .= $header;
+ $plaintext = false;
+ if(intval(get_pconfig(local_user(),'system','plaintext')))
+ $plaintext = true;
+
+
$tpl = get_markup_template('msg-header.tpl');
$a->page['htmlhead'] .= replace_macros($tpl, array(
'$baseurl' => $a->get_baseurl(),
+ '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
'$nickname' => $a->user['nickname'],
'$linkurl' => t('Please enter a link URL:')
));
diff --git a/mod/network.php b/mod/network.php
index 8da1561a0..27c6e315b 100755
--- a/mod/network.php
+++ b/mod/network.php
@@ -470,7 +470,7 @@ function network_content(&$a, $update = 0) {
if(count($r)) {
foreach($r as $rr)
- if(! array_key_exists($rr['item_id'],$parents_arr))
+ if(! in_array($rr['item_id'],$parents_arr))
$parents_arr[] = $rr['item_id'];
$parents_str = implode(', ', $parents_arr);