From 4104162179d4df086151dd4a3a4ec84fed56110e Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Thu, 14 Jul 2022 10:22:59 -0700
Subject: [PATCH] Fixes #4820 - Removed possibility of broken tag links.

---
 e107_plugins/tagcloud/e_menu.php        | 1 +
 e107_plugins/tagcloud/tagcloud_menu.php | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/e107_plugins/tagcloud/e_menu.php b/e107_plugins/tagcloud/e_menu.php
index 55e5125fa..3f6dae24b 100644
--- a/e107_plugins/tagcloud/e_menu.php
+++ b/e107_plugins/tagcloud/e_menu.php
@@ -30,6 +30,7 @@ class tagcloud_menu
 	{
 		$fields = array();
 		$fields['tagcloud_caption']       = array('title'=> LAN_CAPTION, 'type'=>'text', 'multilan'=>true, 'writeParms'=>array('size'=>'xxlarge'));
+		$fields['order']       = array('title'=> LAN_ORDER, 'type'=>'dropdown', 'writeParms'=>['optArray'=>['tag,asc'=>'Tag ASC', 'tag,desc'=>'Tag DESC', 'size,asc'=>'Size ASC','size,desc'=>'Size DESC']]);
 		$fields['tagcloud_limit']       = array('title'=> LAN_LIMIT, 'type'=>'number');
         return $fields;
 
diff --git a/e107_plugins/tagcloud/tagcloud_menu.php b/e107_plugins/tagcloud/tagcloud_menu.php
index b518f3989..57a6650c7 100644
--- a/e107_plugins/tagcloud/tagcloud_menu.php
+++ b/e107_plugins/tagcloud/tagcloud_menu.php
@@ -79,15 +79,16 @@ if(!class_exists('tagcloud_menu'))
 					foreach ($tmp as $word)
 					{
 
-						if($c >= $words)
+						$word = trim($word);
+
+						if(empty($word) || ($c >= $words))
 						{
 							continue;
 						}
 
 
-
 						//$newsUrlparms = array('id'=> $row['news_id'], 'name'=>'a name');
-						$url = e107::getUrl()->create('news/list/tag', array('tag' => $word)); // SITEURL."news.php?tag=".$word;
+						$url = e107::getUrl()->create('news/list/tag', array('tag' => str_replace(' ','-',$word))); // SITEURL."news.php?tag=".$word;
 						$cloud->addTag(array('tag' => $word, 'url' => $url));
 						$c++;
 						$wordCount++;