scrape_dfrn now scrapes the address as well.

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index e6af5f3db7c3ff07608162cca6a08977496a09bb..f210bff72100c363ee4355fb0a07eed4a86d90f8 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -20,6 +20,10 @@ function replace_macros($s,$r) {
        $stamp1 = microtime(true);
 
        $a = get_app();
+       
+       // pass $baseurl to all templates
+       $r['$baseurl'] = $a->get_baseurl();
+       
 
        $t = $a->template_engine();
        try {
@@ -1020,8 +1024,9 @@ if(! function_exists('valid_email')) {
  */
 function valid_email($x){
 
-       if(get_config('system','disable_email_validation'))
-               return true;
+       // Removed because Fabio told me so.
+       //if(get_config('system','disable_email_validation'))
+       //      return true;
 
        if(preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',$x))
                return true;