[xoops-svn] SF.net SVN: xoops:[9424] XoopsModules/smallworld/trunk/smallworld

[<dj...@us...>]

Revision: 9424
          http://xoops.svn.sourceforge.net/xoops/?rev=9424&view=rev
Author:   djculex
Date:     2012-05-02 12:45:54 +0000 (Wed, 02 May 2012)
Log Message:
-----------
Bugfix: More utf-8 special entities not displayed correct

Modified Paths:
--------------
    XoopsModules/smallworld/trunk/smallworld/loadmore.php
    XoopsModules/smallworld/trunk/smallworld/message_ajax.php
    XoopsModules/smallworld/trunk/smallworld/permalink.php
    XoopsModules/smallworld/trunk/smallworld/smallworldshare.php

Modified: XoopsModules/smallworld/trunk/smallworld/loadmore.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/loadmore.php	2012-05-01 23:12:18 UTC (rev 9423)
+++ XoopsModules/smallworld/trunk/smallworld/loadmore.php	2012-05-02 12:45:54 UTC (rev 9424)
@@ -64,7 +64,7 @@
 		foreach ($updatesarray as $data) {
 			$wm['msg_id']		= 	$data['msg_id'];
 			$wm['orimessage']	=	str_replace(array("\r", "\n"), '',$data['message']);
-			$wm['message']		=	smallworld_tolink(htmlentities($data['message']), $data['uid_fk']);
+			$wm['message']		=	smallworld_tolink(htmlspecialchars_decode($data['message']));
 			$wm['created']		=	smallworld_time_stamp($data['created']);
 			$wm['username']		=	$data['username'];
 			$wm['uid_fk']		=	$data['uid_fk'];
@@ -91,7 +91,7 @@
 				foreach($wm['commentsarray'] as $cdata) {
 					$wc['msg_id_fk']	=		$cdata['msg_id_fk'];
 					$wc['com_id']		=		$cdata['com_id'];
-					$wc['comment']		=		smallworld_tolink(htmlentities($cdata['comment'] ));
+					$wc['comment']		=		smallworld_tolink(htmlspecialchars_decode($cdata['comment'] ));
 					$wc['time']			=		smallworld_time_stamp($cdata['created']);
 					$wc['username']		=		$cdata['username'];
 					$wc['uid']			=		$cdata['uid_fk'];

Modified: XoopsModules/smallworld/trunk/smallworld/message_ajax.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/message_ajax.php	2012-05-01 23:12:18 UTC (rev 9423)
+++ XoopsModules/smallworld/trunk/smallworld/message_ajax.php	2012-05-02 12:45:54 UTC (rev 9424)
@@ -57,7 +57,7 @@
 			foreach ($insdata as $data) {
 				$wm['msg_id']		= 	$data['msg_id'];
 				$wm['orimessage']	=	str_replace(array("\r", "\n"), '',$data['message']);
-				$wm['message']		=	smallworld_tolink(htmlspecialchars_decode($data['message']), $data['uid_fk']);
+				$wm['message']		=	smallworld_tolink(htmlspecialchars_decode($data['message']));
 				$wm['created']		=	smallworld_time_stamp($data['created']);
 				$wm['username']		=	$data['username'];
 				$wm['uid_fk']		=	$data['uid_fk'];

Modified: XoopsModules/smallworld/trunk/smallworld/permalink.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/permalink.php	2012-05-01 23:12:18 UTC (rev 9423)
+++ XoopsModules/smallworld/trunk/smallworld/permalink.php	2012-05-02 12:45:54 UTC (rev 9424)
@@ -69,7 +69,7 @@
 				foreach ($updatesarray as $data) {
 					$wm['msg_id']			= 	$data['msg_id'];
 					$wm['orimessage']		=	str_replace(array("\r", "\n"), '',Smallworld_stripWordsKeepUrl($data['message']));
-					$wm['message']			=	smallworld_tolink(htmlentities($data['message']));
+					$wm['message']			=	smallworld_tolink(htmlspecialchars_decode($data['message']));
 					$wm['created']			=	smallworld_time_stamp($data['created']);
 					$wm['username']			=	$data['username'];
 					$wm['uid_fk']			=	$data['uid_fk'];
@@ -92,7 +92,7 @@
 						foreach($wm['commentsarray'] as $cdata) {
 							$wc['msg_id_fk']		=		$cdata['msg_id_fk'];
 							$wc['com_id']			=		$cdata['com_id'];
-							$wc['comment']			=		smallworld_tolink(htmlentities($cdata['comment'] ));
+							$wc['comment']			=		smallworld_tolink(htmlspecialchars_decode($cdata['comment'] ));
 							$wc['time']				=		smallworld_time_stamp($cdata['created']);
 							$wc['username']			=		$cdata['username'];
 							$wc['uid']				=		$cdata['uid_fk'];

Modified: XoopsModules/smallworld/trunk/smallworld/smallworldshare.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/smallworldshare.php	2012-05-01 23:12:18 UTC (rev 9423)
+++ XoopsModules/smallworld/trunk/smallworld/smallworldshare.php	2012-05-02 12:45:54 UTC (rev 9424)
@@ -44,7 +44,7 @@
 			$wm['msg_id']			= 	$data['msg_id'];
 			$wm['orimessage']		=	str_replace(array("\r", "\n"), '',Smallworld_stripWordsKeepUrl($data['message']));
 			$wm['message'] = str_replace(array('&lt;','&gt;'),array('<','>'),$data['message']);
-            $wm['message']			=	Smallworld_cleanup($wm['message']);
+            $wm['message']			=	Smallworld_cleanup(htmlspecialchars_decode($data['message']), $data['uid_fk']);
 			$wm['created']			=	smallworld_time_stamp($data['created']);
 			$wm['username']			=	$data['username'];
 			$wm['uid_fk']			=	$data['uid_fk'];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.