diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-15 16:49:54 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-15 16:49:54 +0200 |
| commit | a147d6113c081694d4209002fa5e57106d4c6f41 (patch) | |
| tree | de6f940efa0439ab3d54ff7d280e221b7b59d348 /include | |
| parent | e825a73f1de308b6ae0ae3cc5549263704a14594 (diff) | |
| parent | f994f9abc6092106659a29f5ee1be0706825c203 (diff) | |
| download | volse-hubzilla-a147d6113c081694d4209002fa5e57106d4c6f41.tar.gz volse-hubzilla-a147d6113c081694d4209002fa5e57106d4c6f41.tar.bz2 volse-hubzilla-a147d6113c081694d4209002fa5e57106d4c6f41.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/Contact.php | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | include/config.php | 0 | ||||
| -rw-r--r-- | include/items.php | 10 | ||||
| -rwxr-xr-x[-rw-r--r--] | include/security.php | 4 |
4 files changed, 13 insertions, 3 deletions
diff --git a/include/Contact.php b/include/Contact.php index 388819b01..9ba1e8ae5 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -158,7 +158,7 @@ function contact_photo_menu($contact) { $o = ""; foreach($menu as $k=>$v){ if ($v!="") { - if(($k !== t("Network Posts")) && ($k !== t("Send PM"))) + if(($k !== t("Network Posts")) && ($k !== t("Send PM")) && ($k !== t('Edit Contact'))) $o .= "<li><a target=\"redir\" href=\"$v\">$k</a></li>\n"; else $o .= "<li><a href=\"$v\">$k</a></li>\n"; diff --git a/include/config.php b/include/config.php index 4cff38090..4cff38090 100755..100644 --- a/include/config.php +++ b/include/config.php diff --git a/include/items.php b/include/items.php index 05c0d5016..85df340d3 100644 --- a/include/items.php +++ b/include/items.php @@ -19,9 +19,15 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) $converse = true; if($a->argv[$x] == 'starred') $starred = true; + if($a->argv[$x] === 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1])) + $category = $a->argv[$x+1]; } + + } + + // default permissions - anonymous user $sql_extra = " AND `allow_cid` = '' AND `allow_gid` = '' AND `deny_cid` = '' AND `deny_gid` = '' "; @@ -101,6 +107,10 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) if(! strlen($last_update)) $last_update = 'now -30 days'; + if(x($category)) { + $sql_extra .= file_tag_file_query('item',$category,'category'); + } + if($public_feed) { if(! $converse) $sql_extra .= " AND `contact`.`self` = 1 "; diff --git a/include/security.php b/include/security.php index 66622fd33..fc816e5d7 100644..100755 --- a/include/security.php +++ b/include/security.php @@ -326,7 +326,7 @@ function check_form_security_token($typename = '', $formname = 'form_security_to } function check_form_security_std_err_msg() { - return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before subitting it.') . EOL; + return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it.') . EOL; } function check_form_security_token_redirectOnErr($err_redirect, $typename = '', $formname = 'form_security_token') { if (!check_form_security_token($typename, $formname)) { @@ -344,4 +344,4 @@ function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'f header('HTTP/1.1 403 Forbidden'); killme(); } -}
\ No newline at end of file +} |