From 022316fd49b6c8ecd713a4d198b587dd13565f8b Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 12 Mar 2013 01:55:25 -0700 Subject: tell it like it is --- LICENSE | 19 +------------------ include/bbcode.php | 4 ++-- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/LICENSE b/LICENSE index 01f1c19d5..35c6d3575 100644 --- a/LICENSE +++ b/LICENSE @@ -1,20 +1,3 @@ -Copyright (c) 2010-2013 the Friendica Project +Copyright (c) 2010-2013 Mike Macgirvin All rights reserved. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/include/bbcode.php b/include/bbcode.php index 6285b16be..82d25ffc8 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -159,8 +159,8 @@ function bb_ShareAttributes($match) { // Bob Smith wrote the following post 2 hours ago $fmt = sprintf( t('%1$s wrote the following %2$s %3$s'), - '' . $author, - '' . t('post'), + '' . $author . '', + '' . t('post') . '', $reldate ); -- cgit v1.2.3