clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #520 from fermionic/20121101-auto-redir-and-theme-threading 

auto redir and theme threading
This commit is contained in:
fermionic 2012-11-01 09:37:18 -07:00
parent c177a5e5b2 3e594f0f1c
commit 6ecccf6830
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/conversation.php
View File

@ -1008,9 +1008,10 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
function get_item_children($arr, $parent) { function get_item_children($arr, $parent) {
$children = array(); $children = array();
$a = get_app();
foreach($arr as $item) { foreach($arr as $item) {
if($item['id'] != $item['parent']) { if($item['id'] != $item['parent']) {
if(get_config('system','thread_allow')) { if(get_config('system','thread_allow') && $a->theme_thread_allow) {
// Fallback to parent-uri if thr-parent is not set // Fallback to parent-uri if thr-parent is not set
$thr_parent = $item['thr-parent']; $thr_parent = $item['thr-parent'];
if($thr_parent == '') if($thr_parent == '')

10
include/redir.php
View File

@ -12,6 +12,8 @@ function auto_redir(&$a, $contact_nick) {
// same nickname as me on other hubs or other networks. Exclude these by requiring // same nickname as me on other hubs or other networks. Exclude these by requiring
// that the contact have a local URL. I will be the only person with my nickname at // that the contact have a local URL. I will be the only person with my nickname at
// this URL, so if a result is found, then I am a contact of the $contact_nick user. // this URL, so if a result is found, then I am a contact of the $contact_nick user.
//
// We also have to make sure that I'm a legitimate contact--I'm not blocked or pending.
$baseurl = $a->get_baseurl(); $baseurl = $a->get_baseurl();
$domain_st = strpos($baseurl, "://"); $domain_st = strpos($baseurl, "://");
@ -20,7 +22,7 @@ function auto_redir(&$a, $contact_nick) {
$baseurl = substr($baseurl, $domain_st + 3); $baseurl = substr($baseurl, $domain_st + 3);
$r = q("SELECT id FROM contact WHERE uid = ( SELECT uid FROM user WHERE nickname = '%s' LIMIT 1 ) $r = q("SELECT id FROM contact WHERE uid = ( SELECT uid FROM user WHERE nickname = '%s' LIMIT 1 )
AND nick = '%s' AND self = 0 AND url LIKE '%%%s%%' LIMIT 1", AND nick = '%s' AND self = 0 AND url LIKE '%%%s%%' AND blocked = 0 AND pending = 0 LIMIT 1",
dbesc($contact_nick), dbesc($contact_nick),
dbesc($a->user['nickname']), dbesc($a->user['nickname']),
dbesc($baseurl) dbesc($baseurl)
@ -30,10 +32,12 @@ function auto_redir(&$a, $contact_nick) {
return; return;
$r = q("SELECT * FROM contact WHERE nick = '%s' AND network = '%s' AND uid = %d LIMIT 1", $r = q("SELECT * FROM contact WHERE nick = '%s'
AND network = '%s' AND uid = %d AND url LIKE '%%%s%%' LIMIT 1",
dbesc($contact_nick), dbesc($contact_nick),
dbesc(NETWORK_DFRN), dbesc(NETWORK_DFRN),
intval(local_user()) intval(local_user()),
dbesc($baseurl)
); );
if(! ($r && count($r))) if(! ($r && count($r)))

4
object/Item.php
View File

@ -519,7 +519,8 @@ class Item extends BaseObject {
* _ false on failure * _ false on failure
*/ */
private function get_comment_box($indent) { private function get_comment_box($indent) {
if(!$this->is_toplevel() && !get_config('system','thread_allow')) { $a = $this->get_app();
if(!$this->is_toplevel() && !(get_config('system','thread_allow') && $a->theme_thread_allow)) {
return ''; return '';
} }
@ -531,7 +532,6 @@ class Item extends BaseObject {
$ww = 'ww'; $ww = 'ww';
if($conv->is_writable() && $this->is_writable()) { if($conv->is_writable() && $this->is_writable()) {
$a = $this->get_app();
$qc = $qcomment = null; $qc = $qcomment = null;
/* /*