summaryrefslogtreecommitdiff
path: root/framework/Web/UI/WebControls/assets
diff options
context:
space:
mode:
authorFabio Bas <ctrlaltca@gmail.com>2014-01-06 22:41:46 +0100
committerDavid <ottodavid@gmx.net>2014-08-21 17:20:54 +0200
commitfc0db15ebce101602fb1cbfa8f6a5cc0f8b58be4 (patch)
tree80fff53aa0d9c60612bc2ca690a46194e9c160cf /framework/Web/UI/WebControls/assets
parent48577f63f414dc3078abc4bdc93bde932fe666a6 (diff)
Happy 2014!
(cherry picked from commit 7915cde127eba2a5143fd45c6b32e81ad91bdfae) Conflicts: framework/Data/Common/Mssql/TMssqlMetaData.php framework/Data/Common/Mysql/TMysqlMetaData.php framework/Data/Common/Oracle/TOracleMetaData.php framework/Data/Common/Pgsql/TPgsqlMetaData.php framework/Data/Common/Sqlite/TSqliteMetaData.php framework/Data/Common/TDbMetaData.php framework/Web/UI/ActiveControls/TCallbackClientScript.php framework/Web/UI/JuiControls/TJuiAutoComplete.php framework/Web/UI/JuiControls/TJuiControlAdapter.php framework/Web/UI/JuiControls/TJuiDraggable.php framework/Web/UI/JuiControls/TJuiDroppable.php framework/Web/UI/JuiControls/TJuiResizable.php framework/Web/UI/JuiControls/TJuiSelectable.php framework/Web/UI/JuiControls/TJuiSortable.php framework/Wsat/TWsatARGenerator.php framework/Wsat/TWsatService.php framework/Wsat/pages/TWsatGenerateAR.php framework/Wsat/pages/TWsatHome.php framework/Wsat/pages/TWsatLogin.php framework/Wsat/pages/TWsatScaffolding.php
Diffstat (limited to 'framework/Web/UI/WebControls/assets')
-rw-r--r--framework/Web/UI/WebControls/assets/captcha.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/Web/UI/WebControls/assets/captcha.php b/framework/Web/UI/WebControls/assets/captcha.php
index ac71d696..bffcd6f2 100644
--- a/framework/Web/UI/WebControls/assets/captcha.php
+++ b/framework/Web/UI/WebControls/assets/captcha.php
@@ -4,7 +4,7 @@
*
* @author Qiang Xue <qiang.xue@gmail.com>
* @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
* @license http://www.pradosoft.com/license/
* @version $Id: captcha.php 3245 2013-01-07 20:23:32Z ctrlaltca $
* @package System.Web.UI.WebControls.assets
@@ -116,7 +116,7 @@ function displayToken($token,$fontSize,$theme)
imagettftext($image,$size,$angle,$x+2,$y+2,$color,$font,$token[$i]);
imagecolordeallocate($image,$color);
}
-
+
header('Content-Type: image/png');
imagepng($image);
imagedestroy($image);