wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

Browse Source
This commit is contained in:
Evan Prodromou 2009-04-07 17:12:53 -04:00
commit 5953d56fe2
5 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
actions/favorited.php
View File

@ -143,6 +143,25 @@ class FavoritedAction extends Action
$this->elementStart('div', 'instructions'); $this->elementStart('div', 'instructions');
$this->raw($output); $this->raw($output);
$this->elementEnd('div'); $this->elementEnd('div');
$favorite = new Fave;
if ($favorite->count()) {
return;
}
$message = _('Favorite notices appear on this page but noone has favorited one yet.') . ' ';
if (common_logged_in()) {
$message .= _('Be the first to add a notice to your favorites by clicking the fave button next to any notice you like.');
}
else {
$message .= _('Why not [register an account](%%action.register%%) and be the first to add a notice to your favorites!');
}
$this->elementStart('div', 'blankfiller');
$this->raw(common_markup_to_html($message));
$this->elementEnd('div');
} }
/** /**

3
actions/public.php
View File

@ -168,14 +168,13 @@ class PublicAction extends Action
function showPageNotice() function showPageNotice()
{ {
$notice = Notice::publicStream(0, 1); $notice = new Notice;
if (!$notice) { if (!$notice) {
$this->serverError(_('Could not retrieve public stream.')); $this->serverError(_('Could not retrieve public stream.'));
return; return;
} }
// no notices in the public stream, let's get out of here
if ($notice->count()) { if ($notice->count()) {
return; return;
} }

2
actions/publictagcloud.php
View File

@ -63,7 +63,7 @@ class PublictagcloudAction extends Action
sprintf(_('These are most popular recent tags on %s '), sprintf(_('These are most popular recent tags on %s '),
common_config('site', 'name'))); common_config('site', 'name')));
$tags = new Notice_tag(); $tags = new Notice_tag;
if ($tags->count()) { if ($tags->count()) {
return; return;
} }

3
db/notice_source.sql
View File

@ -45,4 +45,5 @@ VALUES
('twitux','Twitux','http://live.gnome.org/DanielMorales/Twitux', now()), ('twitux','Twitux','http://live.gnome.org/DanielMorales/Twitux', now()),
('twitvim','TwitVim','http://vim.sourceforge.net/scripts/script.php?script_id=2204', now()), ('twitvim','TwitVim','http://vim.sourceforge.net/scripts/script.php?script_id=2204', now()),
('urfastr','urfastr','http://urfastr.net/', now()), ('urfastr','urfastr','http://urfastr.net/', now()),
('adium', 'Adium', 'http://www.adiumx.com/', now()); ('adium', 'Adium', 'http://www.adiumx.com/', now()),
('yatca','Yatca','http://www.yatca.com/', now());

6
lib/util.php
View File

@ -581,10 +581,8 @@ function common_shorten_link($url, $reverse = false)
function common_xml_safe_str($str) function common_xml_safe_str($str)
{ {
$xmlStr = htmlentities(iconv('UTF-8', 'UTF-8//IGNORE', $str), ENT_NOQUOTES, 'UTF-8'); // Neutralize control codes and surrogates
return preg_replace('/[\p{Cc}\p{Cs}]/u', '*', $str);
// Replace control, formatting, and surrogate characters with '*', ala Twitter
return preg_replace('/[\p{Cc}\p{Cf}\p{Cs}]/u', '*', $str);
} }
function common_tag_link($tag) function common_tag_link($tag)