diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-16 01:16:29 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-16 01:16:29 -0700 |
| commit | 051759580dc7aff7d5b349b3b5271f054c7d3423 (patch) | |
| tree | 05d480dbf9b19713d05140b904b7443540e5e07b | |
| parent | fb3f63bf596e77fe25c8b60c74651e39b62b1436 (diff) | |
| download | volse-hubzilla-051759580dc7aff7d5b349b3b5271f054c7d3423.tar.gz volse-hubzilla-051759580dc7aff7d5b349b3b5271f054c7d3423.tar.bz2 volse-hubzilla-051759580dc7aff7d5b349b3b5271f054c7d3423.zip | |
namespace error
| -rw-r--r-- | Zotlabs/Widget/Conversations.php | 2 | ||||
| -rwxr-xr-x | include/items.php | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Zotlabs/Widget/Conversations.php b/Zotlabs/Widget/Conversations.php index fa59ce20c..c1f1eff16 100644 --- a/Zotlabs/Widget/Conversations.php +++ b/Zotlabs/Widget/Conversations.php @@ -33,7 +33,7 @@ class Conversations { require_once('include/message.php'); // private_messages_list() can do other more complicated stuff, for now keep it simple - $r = private_messages_list(local_channel(), $mailbox, App::$pager['start'], App::$pager['itemspage']); + $r = private_messages_list(local_channel(), $mailbox, \App::$pager['start'], \App::$pager['itemspage']); if(! $r) { info( t('No messages.') . EOL); diff --git a/include/items.php b/include/items.php index c929bb378..c6aedc2e4 100755 --- a/include/items.php +++ b/include/items.php @@ -528,12 +528,10 @@ function get_item_elements($x,$allow_code = false) { $arr = array(); - $key = get_config('system','pubkey'); + $arr['body'] = $x['body']; $maxlen = get_max_import_size(); - $arr['body'] = $x['body']; - if($maxlen && mb_strlen($arr['body']) > $maxlen) { $arr['body'] = mb_substr($arr['body'],0,$maxlen,'UTF-8'); logger('get_item_elements: message length exceeds max_import_size: truncated'); |