Merge https://github.com/friendica/red into pending_merge

2015-02-26 14:21:26 -08:00 · 2015-02-26 14:21:26 -08:00 · 4162dfe43f
commit 4162dfe43f
parent 09f80270de 82bb216952
1 changed files with 3 additions and 0 deletions
--- a/include/zot.php
+++ b/include/zot.php
@ -2896,6 +2896,9 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) {

 				if(count($clean)) {
 					foreach($clean as $k => $v) {
+						if($k == 'abook_dob')
+							$v = dbescdate($v);
+							
 						$r = dbq("UPDATE abook set " . dbesc($k) . " = '" . dbesc($v) 
 						. "' where abook_xchan = '" . dbesc($clean['abook_xchan']) . "' and abook_channel = " . intval($channel['channel_id']));
 					}