fixed: apos in custom link not encoded

Fabrik · Feb 14, 2014 · 1002738 · 1002738
1 parent 5572238
commit 1002738
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/components/com_fabrik/models/list.php b/components/com_fabrik/models/list.php
@@ -2107,7 +2107,7 @@ public function linkHref($elementModel, $row, $repeatCounter = 0)
 				*/
 				if (is_array($v))
 				{
-					$v = JArrayHelper::getValue($v, $repeatCounter);
+					$v = (JArrayHelper::getValue($v, $repeatCounter));
 				}
 				else
 				{
@@ -2125,11 +2125,17 @@ public function linkHref($elementModel, $row, $repeatCounter = 0)
 						}
 					}
 				}
+
+				$v = rawurlencode($v);
+				$array[$k] = $v;
 			}
 
 			$array['rowid'] = $this->getSlug($row);
 			$array['listid'] = $table->id;
 			$link = JRoute::_($this->parseMessageForRowHolder($customLink, $array));
+
+			// NO idea why but ' isnt encoded by the time we arreive here - even though rawurlencode above works.
+			$link = str_replace("'", "%27", $link);
 		}
 
 		return $link;