bug #281

diff --git a/boot.php b/boot.php
index 7a26dd9a24c84a6c6a68fbbca83497d23fd3d994..7a43549bd7f5cb7e139e57701fd1af37d0524f8e 100755 (executable)
--- 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 551d5e1d0f7ee87ef39b0f817bec9659b90de91c..25db62d1611a0d4b78c8970981b03c5e1663abe5 100755 (executable)
--- 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 46027a8973bc79a47600d2ee554a4961bb8f261c..798e809d10bd8350c0b81b6b1fc8721d159a46ee 100755 (executable)
--- 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');