From ce88f0ab6a98bc2e6afffc44699c23d2d9575057 Mon Sep 17 00:00:00 2001 From: Stefan Parviainen Date: Sun, 14 Dec 2014 18:40:59 +0100 Subject: Add hint on how to use search box --- include/nav.php | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/nav.php b/include/nav.php index 9a9dfd6d6..a9bff4b29 100644 --- a/include/nav.php +++ b/include/nav.php @@ -259,6 +259,7 @@ $powered_by = ''; '$localuser' => local_user(), '$sel' => $a->nav_sel, '$powered_by' => $powered_by, + '$help' => t('@name, #tag, content'), '$pleasewait' => t('Please wait...') )); -- cgit v1.2.3 From 372b7b1405f7d2da71dd073ee995bec685fb419d Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 15 Dec 2014 15:56:00 +0000 Subject: Doco: How to write foreign doco in how to write doco doco. --- include/network.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/network.php b/include/network.php index db48caf37..ee2a6a59b 100644 --- a/include/network.php +++ b/include/network.php @@ -1092,7 +1092,9 @@ function discover_by_webbie($webbie) { $r = q("select * from xchan where xchan_hash = '%s' limit 1", dbesc($webbie) ); - if(! $r) { + if($r) + return true; + $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_pubkey, xchan_addr, xchan_url, xchan_name, xchan_network, xchan_instance_url, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ", dbesc($addr), dbesc($guid), @@ -1104,7 +1106,6 @@ function discover_by_webbie($webbie) { dbesc(z_root()), dbescdate(datetime_convert()) ); - } $r = q("select * from hubloc where hubloc_hash = '%s' limit 1", dbesc($webbie) -- cgit v1.2.3 From 204a2c94cd3e8e7e60480dd8628e3dea96597c64 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 15 Dec 2014 15:59:47 +0000 Subject: Undo accidental reversion included in last checkin --- include/network.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/network.php b/include/network.php index ee2a6a59b..15e605673 100644 --- a/include/network.php +++ b/include/network.php @@ -1092,8 +1092,7 @@ function discover_by_webbie($webbie) { $r = q("select * from xchan where xchan_hash = '%s' limit 1", dbesc($webbie) ); - if($r) - return true; + if(! $r) { $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_pubkey, xchan_addr, xchan_url, xchan_name, xchan_network, xchan_instance_url, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ", dbesc($addr), @@ -1106,6 +1105,7 @@ function discover_by_webbie($webbie) { dbesc(z_root()), dbescdate(datetime_convert()) ); + } $r = q("select * from hubloc where hubloc_hash = '%s' limit 1", dbesc($webbie) -- cgit v1.2.3 From c6d0695edff770863ea08e521e5a9961af3b2ef6 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 15 Dec 2014 19:32:28 +0000 Subject: Issue #743 --- include/widgets.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'include') diff --git a/include/widgets.php b/include/widgets.php index b13be4922..71284f6ad 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -496,15 +496,10 @@ function widget_settings_menu($arr) { array( 'label' => t('Export channel'), - 'url' => $a->get_baseurl(true) . '/uexport/basic', + 'url' => $a->get_baseurl(true) . '/uexport', 'selected' => '' ), - array( - 'label' => t('Export content'), - 'url' => $a->get_baseurl(true) . '/uexport/complete', - 'selected' => '' - ), ); if($role === false || $role === 'custom') { -- cgit v1.2.3