GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

facebook action correctly checks max notice length

This commit is contained in:
Evan Prodromou 2009-08-21 08:23:52 -04:00
parent 1285c11d0a
commit d1cc159a04
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/facebookaction.php
View File

@ -35,7 +35,6 @@ if (!defined('LACONICA'))
require_once INSTALLDIR.'/lib/facebookutil.php'; require_once INSTALLDIR.'/lib/facebookutil.php';
require_once INSTALLDIR.'/lib/noticeform.php'; require_once INSTALLDIR.'/lib/noticeform.php';
class FacebookAction extends Action class FacebookAction extends Action
{ {
@ -201,7 +200,6 @@ class FacebookAction extends Action
} }
// Make this into a widget later // Make this into a widget later
function showLocalNav() function showLocalNav()
{ {
@ -261,7 +259,6 @@ class FacebookAction extends Action
$this->endHTML(); $this->endHTML();
} }
function showInstructions() function showInstructions()
{ {
@ -287,7 +284,6 @@ class FacebookAction extends Action
$this->elementEnd('div'); $this->elementEnd('div');
} }
function showLoginForm($msg = null) function showLoginForm($msg = null)
{ {
@ -332,7 +328,6 @@ class FacebookAction extends Action
} }
function updateProfileBox($notice) function updateProfileBox($notice)
{ {
@ -414,7 +409,6 @@ class FacebookAction extends Action
$this->xw->openURI('php://output'); $this->xw->openURI('php://output');
} }
/** /**
* Generate pagination links * Generate pagination links
* *
@ -473,8 +467,9 @@ class FacebookAction extends Action
} else { } else {
$content_shortened = common_shorten_links($content); $content_shortened = common_shorten_links($content);
if (mb_strlen($content_shortened) > 140) { if (Notice::contentTooLong($content_shortened)) {
$this->showPage(_('That\'s too long. Max notice size is 140 chars.')); $this->showPage(sprintf(_('That\'s too long. Max notice size is %d chars.'),
Notice::maxContent()));
return; return;
} }
} }