diff options
| author | friendica <info@friendica.com> | 2014-04-02 15:36:18 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-04-02 15:36:18 -0700 |
| commit | 69513441f517b0b66f310fde002ff6beb189f9ac (patch) | |
| tree | d22f0725b789481f182ca1b0c8280393eb16a83d | |
| parent | 27fec9cb6460a897098bde11b15a9543d09562db (diff) | |
| download | volse-hubzilla-69513441f517b0b66f310fde002ff6beb189f9ac.tar.gz volse-hubzilla-69513441f517b0b66f310fde002ff6beb189f9ac.tar.bz2 volse-hubzilla-69513441f517b0b66f310fde002ff6beb189f9ac.zip | |
removed default maximagesize - it can be set in the admin pages.
| -rw-r--r-- | mod/admin.php | 2 | ||||
| -rw-r--r-- | view/en/htconfig.tpl | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/mod/admin.php b/mod/admin.php index 3655bd09a..064e139ed 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -455,7 +455,7 @@ function admin_page_site(&$a) { '$theme_accessibility' => array('theme_accessibility', t("Accessibility system theme"), get_config('system','accessibility_theme'), t("Accessibility theme"), $theme_choices_accessibility), '$site_channel' => array('site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel")), // '$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices), - '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), + '$maximagesize' => array('maximagesize', t("Maximum image size"), intval(get_config('system','maximagesize')), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), '$register_policy' => array('register_policy', t("Register policy"), get_config('system','register_policy'), "", $register_choices), '$access_policy' => array('access_policy', t("Access policy"), get_config('system','access_policy'), "", $access_choices), '$register_text' => array('register_text', t("Register text"), htmlspecialchars(get_config('system','register_text'), ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")), diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index 840e7a124..9377472bd 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -69,10 +69,6 @@ $a->config['system']['sellpage'] = ''; $a->config['system']['max_import_size'] = 200000; -// maximum size of uploaded photos - -$a->config['system']['maximagesize'] = 12000000; - // Location of PHP command line processor $a->config['system']['php_path'] = '{{$phpath}}'; |