aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-22 14:58:12 -0800
committerfriendica <info@friendica.com>2014-02-22 14:58:12 -0800
commit5b4e3f46bca2def72fd2df2651eacdd853892a23 (patch)
treee0ca39f6ab2ce9284eb985c42163396b8ab07625
parent5dc35bb7f0392903df3cdc600dbb67f5322ec53f (diff)
downloadvolse-hubzilla-5b4e3f46bca2def72fd2df2651eacdd853892a23.tar.gz
volse-hubzilla-5b4e3f46bca2def72fd2df2651eacdd853892a23.tar.bz2
volse-hubzilla-5b4e3f46bca2def72fd2df2651eacdd853892a23.zip
minor stuff, some doco, auth cleanup, and make "unknown" more translateable by context.
-rwxr-xr-xinclude/items.php2
-rw-r--r--include/zot.php4
-rw-r--r--mod/openid.php1
3 files changed, 2 insertions, 5 deletions
diff --git a/include/items.php b/include/items.php
index 1217616d7..d380a7939 100755
--- a/include/items.php
+++ b/include/items.php
@@ -753,7 +753,7 @@ function import_author_rss($x) {
values ( '%s', '%s', '%s', '%s' )",
dbesc($x['url']),
dbesc($x['url']),
- dbesc(($name) ? $name : t('Unknown')),
+ dbesc(($name) ? $name : t('(Unknown)')),
dbesc('rss')
);
if($r) {
diff --git a/include/zot.php b/include/zot.php
index 298abb178..d7d7eb419 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1370,8 +1370,6 @@ function process_delivery($sender,$arr,$deliveries,$relay) {
// remove_community_tag is a no-op if this isn't a community tag activity
remove_community_tag($sender,$arr,$channel['channel_id']);
-
-
$item_id = delete_imported_item($sender,$arr,$channel['channel_id']);
$result[] = array($d['hash'],(($item_id) ? 'deleted' : 'delete_failed'),$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>');
@@ -1414,8 +1412,6 @@ function process_delivery($sender,$arr,$deliveries,$relay) {
}
}
-
-
$r = q("select id, edited from item where mid = '%s' and uid = %d limit 1",
dbesc($arr['mid']),
intval($channel['channel_id'])
diff --git a/mod/openid.php b/mod/openid.php
index 1ab8749ee..b0d4008d4 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -42,6 +42,7 @@ function openid_content(&$a) {
if(($record['account_flags'] == ACCOUNT_OK) || ($record['account_flags'] == ACCOUNT_UNVERIFIED)) {
logger('mod_openid: openid success for ' . $x[0]['channel_name']);
$_SESSION['uid'] = $r[0]['channel_id'];
+ $_SESSION['account_id'] = $r[0]['channel_account_id'];
$_SESSION['authenticated'] = true;
authenticate_success($record,true,true,true,true);
goaway(z_root());