diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-04 02:14:26 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-04 02:14:26 -0400 |
| commit | 2871e28df702f32fc780a84642f101931907d458 (patch) | |
| tree | 3d1e6ce8c5f044467d95844328ac15a4c6e79d0a /mod/settings.php | |
| parent | 06942b36549668eb067650831f286d96aab14a40 (diff) | |
| parent | 8e928d101b628c5f562cee840882892f05a1b838 (diff) | |
| download | volse-hubzilla-2871e28df702f32fc780a84642f101931907d458.tar.gz volse-hubzilla-2871e28df702f32fc780a84642f101931907d458.tar.bz2 volse-hubzilla-2871e28df702f32fc780a84642f101931907d458.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
display settings hooks
re-opened bug #363
this is better
include contact_widgets for categories_widget when doing updates
remove loozah themes which fell too far behind to recover
smal fix
german translation for right_aside
make right_aside translatable and provide german translation... and some css-fixes
suppress duplicates in search
make contact ssl_policy change a function since it is used in a few places
more ssl policy fixes and prevent delivery to soapbox when using local delivery
don't change ssl settings on local photos for remote contact
* master:
Diffstat (limited to 'mod/settings.php')
| -rwxr-xr-x | mod/settings.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mod/settings.php b/mod/settings.php index 926d1faa5..6879da285 100755 --- a/mod/settings.php +++ b/mod/settings.php @@ -229,7 +229,7 @@ function settings_post(&$a) { if ($theme == $a->user['theme']){ - // call theme_post only if theme has not benn changed + // call theme_post only if theme has not been changed if( ($themeconfigfile = get_theme_config_file($theme)) != null){ require_once($themeconfigfile); theme_post($a); @@ -242,6 +242,7 @@ function settings_post(&$a) { intval(local_user()) ); + call_hooks('display_settings_post', $_POST); goaway($a->get_baseurl(true) . '/settings/display' ); return; // NOTREACHED } @@ -679,6 +680,8 @@ function settings_content(&$a) { '$settings_connectors' => $settings_connectors )); + + call_hooks('display_settings', $o); return $o; } |