diff options
| author | Brion Vibber <brion@pobox.com> | 2010-03-19 15:51:22 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-03-19 15:51:22 -0700 |
| commit | 7e2af3dcae956c7490df74be8d94fa09a4bab673 (patch) | |
| tree | 2947bedd07061d2a0bab755c97445b30b4588ed4 /actions | |
| parent | 5a0125691bd4002c38e83f29dd2721cb07b2027e (diff) | |
| parent | c84c4c6839c1791775cc698ad488bc23ed956d5b (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
plugins/OStatus/extlib/hkit/hkit.class.php
plugins/OStatus/lib/discoveryhints.php
Diffstat (limited to 'actions')
| -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 |