diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-18 00:24:33 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-18 00:24:33 -0400 |
| commit | f087fd5581eb13a792c7f53e87cf251f153677cf (patch) | |
| tree | 7e45521325667ef6ac4adac3638f6adf06957033 /include | |
| parent | 74b237d46d9472a125315e35d77bf2d0fdabaa7e (diff) | |
| parent | 1b6c84d8f453ff591451e3304547b239a3d86c5b (diff) | |
| download | volse-hubzilla-f087fd5581eb13a792c7f53e87cf251f153677cf.tar.gz volse-hubzilla-f087fd5581eb13a792c7f53e87cf251f153677cf.tar.bz2 volse-hubzilla-f087fd5581eb13a792c7f53e87cf251f153677cf.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-themes: some css/bug-fixes
messages.po/strings.php at 100% Esperanto
Typo
* master:
Diffstat (limited to 'include')
| -rw-r--r-- | include/items.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php index 63450cff5..0a8bc12c0 100644 --- a/include/items.php +++ b/include/items.php @@ -1476,7 +1476,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) if(! $item['deleted']) logger('consume_feed: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG); - if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) { + if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTIVITY_OBJ_TAGTERM)) { $xo = parse_xml_string($item['object'],false); $xt = parse_xml_string($item['target'],false); if($xt->type === ACTIVITY_OBJ_NOTE) { @@ -2092,7 +2092,7 @@ function local_delivery($importer,$data) { logger('local_delivery: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG); - if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) { + if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTIVITY_OBJ_TAGTERM)) { $xo = parse_xml_string($item['object'],false); $xt = parse_xml_string($item['target'],false); |