From f0a8410a5cbe080b377ec352320872d27ce7d91f Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@bofh.bg>
Date: Sat, 16 Jun 2012 20:52:20 +0300
Subject: Fix two anchor_popup() issues

---
 system/helpers/url_helper.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'system')

diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index 2bd41b04d..58bde17b4 100644
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -204,7 +204,7 @@ if ( ! function_exists('anchor_popup'))
 
 		if ( ! is_array($attributes))
 		{
-			$attributes = array();
+			$attributes = array($attributes);
 		}
 
 		foreach (array('width' => '800', 'height' => '600', 'scrollbars' => 'yes', 'status' => 'yes', 'resizable' => 'yes', 'screenx' => '0', 'screeny' => '0', ) as $key => $val)
@@ -213,10 +213,7 @@ if ( ! function_exists('anchor_popup'))
 			unset($attributes[$key]);
 		}
 
-		if ($attributes !== '')
-		{
-			$attributes = _parse_attributes($attributes);
-		}
+		$attributes = empty($attributes) ? '' : _parse_attributes($attributes);
 
 		return '<a href="javascript:void(0);" onclick="window.open(\''.$site_url."', '_blank', '"._parse_attributes($atts, TRUE)."');\"".$attributes.'>'.$title.'</a>';
 	}
-- 
cgit v1.2.3-24-g4f1b