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

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source 
Conflicts:
	include/zot.php
	install/update.php
	util/messages.po
This commit is contained in:
redmatrix 2015-08-23 20:23:55 -07:00
commit eac9c8a7e6
4 changed files with 745 additions and 745 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/zot.php
View File

@ -2911,6 +2911,7 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
$total_feeds ++; $total_feeds ++;
} }
$disallowed = array('abook_id','abook_account','abook_channel','abook_rating','abook_rating_text'); $disallowed = array('abook_id','abook_account','abook_channel','abook_rating','abook_rating_text');
foreach($arr['abook'] as $abook) { foreach($arr['abook'] as $abook) {
@ -2999,7 +3000,6 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) {
foreach($clean as $k => $v) { foreach($clean as $k => $v) {
if($k == 'abook_dob') if($k == 'abook_dob')
$v = dbescdate($v); $v = dbescdate($v);
$r = dbq("UPDATE abook set " . dbesc($k) . " = '" . dbesc($v) $r = dbq("UPDATE abook set " . dbesc($k) . " = '" . dbesc($v)
. "' where abook_xchan = '" . dbesc($clean['abook_xchan']) . "' and abook_channel = " . intval($channel['channel_id'])); . "' where abook_xchan = '" . dbesc($clean['abook_xchan']) . "' and abook_channel = " . intval($channel['channel_id']));
} }

2
version.inc
View File

@ -1 +1 @@
2015-08-20.1130 2015-08-23.1133

744
view/es/messages.po
View File

File diff suppressed because it is too large Load Diff

742
view/es/strings.php
View File

File diff suppressed because it is too large Load Diff