forked from GNUsocial/gnu-social
shortenLinks with a capital L
This commit is contained in:
parent
d4be5349b3
commit
6505504411
@ -211,7 +211,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction
|
|||||||
$this->clientError(_('No such user.'), 404);
|
$this->clientError(_('No such user.'), 404);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Do not call shortenlinks until the whole notice has been build */
|
/* Do not call shortenLinks until the whole notice has been build */
|
||||||
|
|
||||||
// Check for commands
|
// Check for commands
|
||||||
|
|
||||||
@ -248,13 +248,13 @@ class ApiStatusesUpdateAction extends ApiAuthAction
|
|||||||
try {
|
try {
|
||||||
$upload = MediaFile::fromUpload('media', $this->scoped);
|
$upload = MediaFile::fromUpload('media', $this->scoped);
|
||||||
$this->status .= ' ' . $upload->shortUrl();
|
$this->status .= ' ' . $upload->shortUrl();
|
||||||
/* Do not call shortenlinks until the whole notice has been build */
|
/* Do not call shortenLinks until the whole notice has been build */
|
||||||
} catch (NoUploadedMediaException $e) {
|
} catch (NoUploadedMediaException $e) {
|
||||||
// There was no uploaded media for us today.
|
// There was no uploaded media for us today.
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Do call shortenlinks here & check notice length since notice is about to be saved & sent */
|
/* Do call shortenlinks here & check notice length since notice is about to be saved & sent */
|
||||||
$status_shortened = $this->auth_user->shortenlinks($this->status);
|
$status_shortened = $this->auth_user->shortenLinks($this->status);
|
||||||
|
|
||||||
if (Notice::contentTooLong($status_shortened)) {
|
if (Notice::contentTooLong($status_shortened)) {
|
||||||
if ($upload instanceof MediaFile) {
|
if ($upload instanceof MediaFile) {
|
||||||
|
Loading…
Reference in New Issue
Block a user