X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=6ec557b2f915f9ba08e1ab8989caea9a5e0e47e8;hb=aac0605bd1baf1462a20646c01edc19557a33b93;hp=44c75156c71252b3053644d2a0f5836b47c3db6d;hpb=854e208c05ae1cfb584911f93f70f81878d0dff1;p=quix0rs-gnu-social.git

diff --git a/lib/util.php b/lib/util.php
index 44c75156c7..6ec557b2f9 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -146,7 +146,9 @@ function common_init_language() {
 	bind_textdomain_codeset("laconica", "UTF-8");
 	textdomain("laconica");
 	setlocale(LC_CTYPE, 'C');
-	common_log(LOG_INFO,'Language requested:'.$language.' Locale set:'.$locale_set,__FILE__);
+	if(!$locale_set) {
+		common_log(LOG_INFO,'Language requested:'.$language.' - locale could not be set:',__FILE__);
+	}
 }
 
 define('PAGE_TYPE_PREFS', 'text/html,application/xhtml+xml,application/xml;q=0.3,text/xml;q=0.2');
@@ -745,6 +747,13 @@ function common_render_uri_thingy($matches) {
 	return '<a href="' . $uri . '" class="extlink">' . $uri . '</a>' . $trailer;
 }
 
+function common_xml_safe_str($str) {
+	$xmlStr = htmlentities(iconv('UTF-8', 'UTF-8//IGNORE', $str), ENT_NOQUOTES, 'UTF-8');
+	
+	// Replace control, formatting, and surrogate characters with '*', ala Twitter
+	return preg_replace('/[\p{Cc}\p{Cf}\p{Cs}]/u', '*', $str);
+}
+
 function common_tag_link($tag) {
 	$canonical = common_canonical_tag($tag);
 	$url = common_local_url('tag', array('tag' => $canonical));