Merge branch 'master' of https://github.com/boonex/dolphin

inc/classes/BxDolMetatags.php

@@ -113,8 +113,10 @@ class BxDolMetatags extends BxDol implements iBxDolFactoryObject
     public function keywordsAdd($iId, $s) 
     {
         $a = array();
-        if (!preg_match_all('/(\#[\pL\pN]+)/u', $s, $a))
+        if (!preg_match_all('/(\#[\pL\pN]+)/u', strip_tags($s), $a)) {
+            $this->_oQuery->keywordsDelete($iId);
             return 0;
+        }
 
         $a[0] = array_unique($a[0]);
 

inc/utils.inc.php

@@ -484,6 +484,7 @@ function clear_xss($val)
         $oConfig = HTMLPurifier_Config::createDefault();
 
         $oConfig->set('Cache.SerializerPath', rtrim(BX_DIRECTORY_PATH_CACHE, '/'));
+        $oConfig->set('Cache.SerializerPermissions', BX_DOL_DIR_RIGHTS);
 
         $oConfig->set('HTML.SafeObject', 'true');
         $oConfig->set('Output.FlashCompat', 'true');

modules/base/text/template/entry-text.html

@@ -1,7 +1,7 @@
 
 <div class="bx-base-text-entity-content bx-def-constraint-list bx-def-constraint-pre bx-def-constraint-object bx-def-constraint-iframe bx-def-constraint-img">
     <h1>__title__</h1>
-    <p class="bx-base-text-entity-location bx-def-font-grayed bx-def-font-small">__entry_location__</p>
+    <p class="bx-base-text-entity-location bx-def-font-grayed bx-def-font-middle">__entry_location__</p>
     __text__
 </div>
 

modules/boonex/english/data/langs/system.xml

@@ -1725,8 +1725,8 @@ If it is not enabled then please consider implement this optimization, since it
 	<string name="_sys_layout_top_area_bar_right"><![CDATA[Top area with right bar]]></string>
 	<string name="_sys_layout_topbottom_area_2_columns"><![CDATA[Top&bottom areas with 2 columns in the middle]]></string>
 	<string name="_sys_loading"><![CDATA[Loading...]]></string>
-	<string name="_sys_location_country"><![CDATA[ &mdash; in {0}]]></string>
-	<string name="_sys_location_country_city"><![CDATA[ &mdash; in {1}, {0}]]></string>
+	<string name="_sys_location_country"><![CDATA[<i class="sys-icon location-arrow"></i> {0}]]></string>
+	<string name="_sys_location_country_city"><![CDATA[<i class="sys-icon location-arrow"></i> {1}, {0}]]></string>
 	<string name="_sys_location_determining"><![CDATA[Determining location...]]></string>
 	<string name="_sys_location_geolocation_not_supported_by_browser"><![CDATA[Geolocation is not supported by this browser]]></string>
 	<string name="_sys_location_undefined"><![CDATA[No location]]></string>