harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

e2ee in comments and a bit of cleanup so not every theme has to define how to insert bbcode, only if they're doing something special (e.g. this is how to implement a javascript plugin :-)), and I got rid of the predefined http:// in the bbcode for urls. You're almost always pasting a url which already has that bit and it just creates an extra step.

Browse Source
This commit is contained in:
friendica
2013-11-14 15:41:25 -08:00
parent 33f570a187
commit 592c24e162
6 changed files with 55 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/ItemObject.php
View File

@@ -27,6 +27,7 @@ class Item extends BaseObject {
private $threaded = false;
private $visiting = false;
private $channel = null;
private $cipher = 'aes256';
public function __construct($data) {
$a = $this->get_app();
@@ -34,6 +35,10 @@ class Item extends BaseObject {
$this->data = $data;
$this->toplevel = ($this->get_id() == $this->get_data_value('parent'));
$cipher = get_pconfig($x['profile_uid'],'system','default_cipher');
if($cipher)
$this->cipher = $cipher;
// Prepare the children
if(count($data['children'])) {
@@ -538,7 +543,11 @@ class Item extends BaseObject {
'$edvideo' => t('Video'),
'$preview' => ((feature_enabled($conv->get_profile_owner(),'preview')) ? t('Preview') : ''),
'$indent' => $indent,
'$feature_encrypt' => ((feature_enabled($conv->get_profile_owner(),'content_encrypt')) ? true : false),
'$encrypt' => t('Encrypt text'),
'$cipher' => $this->cipher,
'$sourceapp' => get_app()->sourcename
));
return $comment_box;