diff options
| author | friendica <info@friendica.com> | 2014-12-15 14:37:57 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-12-15 14:37:57 -0800 |
| commit | 2e990743e757bea6712a3f3e9639a43c89b52901 (patch) | |
| tree | cfc7da5c92a471de875bdd15dc491635fb987ee8 /include | |
| parent | f28103d595c0e02dfd30d44b3115915994e9ecc0 (diff) | |
| parent | 3b343f8f6c7936aba93ed4a0b09a19086f18ae0d (diff) | |
| download | volse-hubzilla-2e990743e757bea6712a3f3e9639a43c89b52901.tar.gz volse-hubzilla-2e990743e757bea6712a3f3e9639a43c89b52901.tar.bz2 volse-hubzilla-2e990743e757bea6712a3f3e9639a43c89b52901.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/nav.php | 1 | ||||
| -rw-r--r-- | include/network.php | 1 | ||||
| -rw-r--r-- | include/widgets.php | 7 |
3 files changed, 3 insertions, 6 deletions
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...') )); diff --git a/include/network.php b/include/network.php index db48caf37..15e605673 100644 --- a/include/network.php +++ b/include/network.php @@ -1093,6 +1093,7 @@ function discover_by_webbie($webbie) { dbesc($webbie) ); 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), dbesc($guid), diff --git a/include/widgets.php b/include/widgets.php index cb199d2b8..bb9890add 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -500,15 +500,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') { |