Merge branch 'master' into develop

widgets/widget_like.php

@@ -52,8 +52,6 @@ function like_widget_content(&$a, $conf){
 	$dislikes = $r[0]['c'];
 
 
-	require_once("include/conversation.php");
-
 	$o = "";
 
 #	$t = file_get_contents( dirname(__file__). "/widget_like.tpl" );

widgets/widgets.php

@@ -77,7 +77,7 @@ function widgets_module() {
 }
 
 function _abs_url($s){
-	$a = get_app();
+	$a = \get_app();
 	return preg_replace("|href=(['\"])([^h][^t][^t][^p])|", "href=\$1".$a->getBaseURL()."/\$2", $s);
 }