aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-02-12 14:18:32 -0800
committerfriendica <info@friendica.com>2012-02-12 14:18:32 -0800
commit330a876d819c640d759776b12c79b46751c4754a (patch)
tree32392873489b456bb085fbaf4d17ec53f7232d2c
parent34ac72cffdc9c5614ec36013319634b5173f4b47 (diff)
downloadvolse-hubzilla-330a876d819c640d759776b12c79b46751c4754a.tar.gz
volse-hubzilla-330a876d819c640d759776b12c79b46751c4754a.tar.bz2
volse-hubzilla-330a876d819c640d759776b12c79b46751c4754a.zip
bug #281
-rwxr-xr-xboot.php2
-rwxr-xr-xinclude/network.php3
-rwxr-xr-xinclude/text.php6
3 files changed, 8 insertions, 3 deletions
diff --git a/boot.php b/boot.php
index 7a26dd9a2..7a43549bd 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 551d5e1d0..25db62d16 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 46027a897..798e809d1 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');