keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into bbcode

Browse source
This commit is contained in:
Abinoam P. Marques Jr 2012-02-12 18:56:53 -08:00
commit 9697e82331
6 changed files with 4175 additions and 3961 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1249' ); define ( 'FRIENDICA_VERSION', '2.3.1250' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1121 ); define ( 'DB_UPDATE_VERSION', 1121 );

2
include/bbcode.php
View file

@ -11,7 +11,7 @@ function stripcode_br_cb($s) {
function tryoembed($match){ function tryoembed($match){
$url = ((count($match)==2)?$match[1]:$match[2]); $url = ((count($match)==2)?$match[1]:$match[2]);
logger("tryoembed: $url"); // logger("tryoembed: $url");
$o = oembed_fetch_url($url); $o = oembed_fetch_url($url);

9
include/datetime.php
View file

@ -260,10 +260,11 @@ function relative_date($posted_date) {
); );
foreach ($a as $secs => $str) { foreach ($a as $secs => $str) {
$d = $etime / $secs; $d = $etime / $secs;
if ($d >= 1) { if ($d >= 1) {
$r = round($d); $r = round($d);
return $r . ' ' . (($r == 1) ? $str[0] : $str[1]) . t(' ago'); // translators - e.g. 22 hours ago, 1 minute ago
return sprintf( t('%1$d %2$s ago'),$r, (($r == 1) ? $str[0] : $str[1]));
} }
} }
}} }}

3
include/network.php
View file

@ -579,6 +579,9 @@ function fetch_xrd_links($url) {
if(! function_exists('validate_url')) { if(! function_exists('validate_url')) {
function validate_url(&$url) { function validate_url(&$url) {
// no naked subdomains
if(strpos($url,'.') === false)
return false;
if(substr($url,0,4) != 'http') if(substr($url,0,4) != 'http')
$url = 'http://' . $url; $url = 'http://' . $url;
$h = @parse_url($url); $h = @parse_url($url);

6
include/text.php
View file

@ -428,8 +428,10 @@ if(! function_exists('logger')) {
function logger($msg,$level = 0) { function logger($msg,$level = 0) {
// turn off logger in install mode // turn off logger in install mode
global $a; global $a;
if ($a->module == 'install') return; global $db;
if(($a->module == 'install') || (! ($db && $db->connected))) return;
$debugging = get_config('system','debugging'); $debugging = get_config('system','debugging');
$loglevel = intval(get_config('system','loglevel')); $loglevel = intval(get_config('system','loglevel'));
$logfile = get_config('system','logfile'); $logfile = get_config('system','logfile');

8114
util/messages.po
View file

File diff suppressed because it is too large Load diff