diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-06 15:58:56 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-06 15:58:56 +0100 |
| commit | 5776af30e84356dade6b644a56dce2094ecb99eb (patch) | |
| tree | 985a3325bdf75e341d70b2305c923dfbb2064972 /mod | |
| parent | 91f751d10531e73078f7efb4efa1f5e215a8f871 (diff) | |
| parent | 4ca0c2cfd14df5e2b6e9c7f59a10628f7653d6a4 (diff) | |
| download | volse-hubzilla-5776af30e84356dade6b644a56dce2094ecb99eb.tar.gz volse-hubzilla-5776af30e84356dade6b644a56dce2094ecb99eb.tar.bz2 volse-hubzilla-5776af30e84356dade6b644a56dce2094ecb99eb.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/ffsapi.php | 7 | ||||
| -rw-r--r-- | mod/settings.php | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mod/ffsapi.php b/mod/ffsapi.php index de47408bd..f4033e63b 100644 --- a/mod/ffsapi.php +++ b/mod/ffsapi.php @@ -4,7 +4,7 @@ function ffsapi_content(&$a) { $baseurl = z_root(); -$name = sprintf( t('Social Provider on %1$s'), get_config('system','sitename')); +$name = get_config('system','sitename'); $description = t('Share content from Firefox to $Projectname'); $author = 'Mike Macgirvin'; $homepage = 'http://hubzilla.org'; @@ -35,8 +35,9 @@ var data = { // social bookmarks are available in Firefox 26 "markURL": baseurl+"/rbmark?f=&url=%{url}&title=%{title}", // icons should be 32x32 pixels - "markedIcon": baseurl+"/images/checkbox-checked-32.png", - "unmarkedIcon": baseurl+"/images/checkbox-unchecked-32.png", + // "markedIcon": baseurl+"/images/checkbox-checked-32.png", + // "unmarkedIcon": baseurl+"/images/checkbox-unchecked-32.png", + "unmarkedIcon": baseurl+"/images/hz-bookmark-32.png", // should be available for display purposes "description": '$description', diff --git a/mod/settings.php b/mod/settings.php index 18bfaeb08..9a18d8e48 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -218,7 +218,8 @@ function settings_post(&$a) { check_form_security_token_redirectOnErr('/settings/account', 'settings_account'); - call_hooks('settings_account', $_POST); + call_hooks('account_settings_post', $_POST); +// call_hooks('settings_account', $_POST); $errs = array(); |