From 330a876d819c640d759776b12c79b46751c4754a Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 12 Feb 2012 14:18:32 -0800 Subject: [PATCH] bug #281 --- boot.php | 2 +- include/network.php | 3 +++ include/text.php | 6 ++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index 7a26dd9a24..7a43549bd7 100755 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1249' ); +define ( 'FRIENDICA_VERSION', '2.3.1250' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1121 ); diff --git a/include/network.php b/include/network.php index 551d5e1d0f..25db62d161 100755 --- a/include/network.php +++ b/include/network.php @@ -579,6 +579,9 @@ function fetch_xrd_links($url) { if(! function_exists('validate_url')) { function validate_url(&$url) { + // no naked subdomains + if(strpos($url,'.') === false) + return false; if(substr($url,0,4) != 'http') $url = 'http://' . $url; $h = @parse_url($url); diff --git a/include/text.php b/include/text.php index 46027a8973..798e809d10 100755 --- a/include/text.php +++ b/include/text.php @@ -428,8 +428,10 @@ if(! function_exists('logger')) { function logger($msg,$level = 0) { // turn off logger in install mode global $a; - if ($a->module == 'install') return; - + global $db; + + if(($a->module == 'install') || (! ($db && $db->connected))) return; + $debugging = get_config('system','debugging'); $loglevel = intval(get_config('system','loglevel')); $logfile = get_config('system','logfile'); -- 2.39.5