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

Bookmark saving robustness fixes

Browse Source 
First, if the tags box is empty, don't save an empty tag for the notice.

Second, if URL shortening fails, just use the regular URL.
This commit is contained in:
Evan Prodromou 2011-01-23 12:57:20 -05:00
parent b72fe00ae3
commit c2d7a08d07
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/Bookmark/Bookmark.php
View File

@ -214,7 +214,11 @@ class Bookmark extends Memcached_DataObject
} }
if (is_string($rawtags)) { if (is_string($rawtags)) {
$rawtags = preg_split('/[\s,]+/', $rawtags); if (empty($rawtags)) {
$rawtags = array();
} else {
$rawtags = preg_split('/[\s,]+/', $rawtags);
}
} }
$nb = new Bookmark(); $nb = new Bookmark();
@ -274,10 +278,15 @@ class Bookmark extends Memcached_DataObject
// Use user's preferences for short URLs, if possible // Use user's preferences for short URLs, if possible
$user = User::staticGet('id', $profile->id); try {
$user = User::staticGet('id', $profile->id);
$shortUrl = File_redirection::makeShort($url, $shortUrl = File_redirection::makeShort($url,
empty($user) ? null : $user); empty($user) ? null : $user);
} catch (Exception $e) {
// Don't let this stop us.
$shortUrl = $url;
}
$content = sprintf(_('"%s" %s %s %s'), $content = sprintf(_('"%s" %s %s %s'),
$title, $title,