diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-22 13:56:16 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-22 13:56:16 -0700 |
| commit | e89908f26140c217e01b2f8f755712f38f3935f3 (patch) | |
| tree | 6b241fc2e33f3528cf48b415ef67906826b02e24 /actions/siteadminpanel.php | |
| parent | 714d920faea302b55857cc3bec4e9e6160ea136a (diff) | |
| parent | eb563937df921e5fc67ca0c87e229feb2907fd19 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
lib/channel.php
scripts/imdaemon.php
Diffstat (limited to 'actions/siteadminpanel.php')
| -rw-r--r-- | actions/siteadminpanel.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php index cb3c2e8fd..e5482987f 100644 --- a/actions/siteadminpanel.php +++ b/actions/siteadminpanel.php @@ -161,8 +161,8 @@ class SiteadminpanelAction extends AdminPanelAction // Validate text limit - if (!Validate::number($values['site']['textlimit'], array('min' => 140))) { - $this->clientError(_("Minimum text limit is 140 characters.")); + if (!Validate::number($values['site']['textlimit'], array('min' => 0))) { + $this->clientError(_("Minimum text limit is 0 (unlimited).")); } // Validate dupe limit |