From 98756ba4d973d22ef8725db70eabf5a26a4737a3 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 17 Dec 2018 10:04:15 +0200
Subject: [ci skip] Merge pull request #5652 from Khuthaily/patch-1

Add px to width and height inline style output of create_captcha()
---
 system/helpers/captcha_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/helpers/captcha_helper.php')

diff --git a/system/helpers/captcha_helper.php b/system/helpers/captcha_helper.php
index a67b72bd5..94779e4e2 100644
--- a/system/helpers/captcha_helper.php
+++ b/system/helpers/captcha_helper.php
@@ -333,7 +333,7 @@ if ( ! function_exists('create_captcha'))
 			return FALSE;
 		}
 
-		$img = '<img '.($img_id === '' ? '' : 'id="'.$img_id.'"').' src="'.$img_url.$img_filename.'" style="width: '.$img_width.'; height: '.$img_height .'; border: 0;" alt=" " />';
+		$img = '<img '.($img_id === '' ? '' : 'id="'.$img_id.'"').' src="'.$img_url.$img_filename.'" style="width: '.$img_width.'px; height: '.$img_height .'px; border: 0;" alt=" " />';
 		ImageDestroy($im);
 
 		return array('word' => $word, 'time' => $now, 'image' => $img, 'filename' => $img_filename);
-- 
cgit v1.2.3-24-g4f1b


From 0e59db6c207b3108565ef4ab6c18b81353478d91 Mon Sep 17 00:00:00 2001
From: "Instructor, BCIT" <jim_parry@bcit.ca>
Date: Tue, 1 Jan 2019 08:34:36 -0800
Subject: Merge pull request #5662 from jim-parry/copyright2019

Update copyright date to 2019
---
 system/helpers/captcha_helper.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'system/helpers/captcha_helper.php')

diff --git a/system/helpers/captcha_helper.php b/system/helpers/captcha_helper.php
index 94779e4e2..37ef04b24 100644
--- a/system/helpers/captcha_helper.php
+++ b/system/helpers/captcha_helper.php
@@ -6,7 +6,7 @@
  *
  * This content is released under the MIT License (MIT)
  *
- * Copyright (c) 2014 - 2018, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2019, British Columbia Institute of Technology
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -29,8 +29,8 @@
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
- * @license	http://opensource.org/licenses/MIT	MIT License
+ * @copyright	Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
+ * @license	https://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.0.0
  * @filesource
-- 
cgit v1.2.3-24-g4f1b