Revert "Revert "merge""

This reverts commit 9294f72adb.
2013-08-03 00:18:14 +02:00
parent 9294f72adb
commit f09ac4e597
119 changed files with 1506 additions and 1508 deletions
@@ -1,6 +1,7 @@
 <?php

 require_once('acl_selectors.php');
+require_once('include/crypto.php');

 function editpost_content(&$a) {

@@ -47,6 +48,15 @@ function editpost_content(&$a) {
 	));


+
+	if($itm[0]['item_flags'] & ITEM_OBSCURED) {
+		$key = get_config('system','prvkey');
+		if($itm[0]['title'])
+			$itm[0]['title'] = aes_unencapsulate(json_decode($itm[0]['title'],true),$key);
+		if($itm[0]['body'])
+			$itm[0]['body'] = aes_unencapsulate(json_decode($itm[0]['body'],true),$key);
+	}
+
 	$tpl = get_markup_template("jot.tpl");
 		
 	$jotplugins = '';