aboutsummaryrefslogtreecommitdiffstats
path: root/mod/settings.php
diff options
context:
space:
mode:
authorVasudev Kamath <kamathvasudev@gmail.com>2012-04-27 22:43:26 +0530
committerVasudev Kamath <kamathvasudev@gmail.com>2012-04-27 22:43:26 +0530
commit214ec91a3f2c5fec6cced93f669b3a9725f0e40a (patch)
treed05fd4c7e65cc89cf46d8347a2d0e6df135ed864 /mod/settings.php
parentf1d84c10458986a0a014f844e784617401764b29 (diff)
parent4b92e3543c9af26e590cfecf561ff7483e66e6c9 (diff)
downloadvolse-hubzilla-214ec91a3f2c5fec6cced93f669b3a9725f0e40a.tar.gz
volse-hubzilla-214ec91a3f2c5fec6cced93f669b3a9725f0e40a.tar.bz2
volse-hubzilla-214ec91a3f2c5fec6cced93f669b3a9725f0e40a.zip
Merge branch 'master' of git://github.com/friendica/friendica
Diffstat (limited to 'mod/settings.php')
-rw-r--r--mod/settings.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/mod/settings.php b/mod/settings.php
index 721468437..3072d3d65 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -75,6 +75,11 @@ EOT;
'label' => t('Export personal data'),
'url' => $a->get_baseurl(true) . '/uexport',
'selected' => ''
+ ),
+ array(
+ 'label' => t('Remove account'),
+ 'url' => $a->get_baseurl(true) . '/removeme',
+ 'selected' => ''
)
);
@@ -696,8 +701,8 @@ function settings_content(&$a) {
$allowed_themes_raw = explode(',',$allowed_themes_str);
$allowed_themes = array();
if(count($allowed_themes_raw))
- foreach($allowed_themes_raw as $x)
- if(strlen(trim($x)))
+ foreach($allowed_themes_raw as $x)
+ if(strlen(trim($x)) && is_dir("view/theme/$x"))
$allowed_themes[] = trim($x);