From a7d44dfc89101b72621e02ecb0b31be812aeb68f Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Tue, 6 Jun 2017 14:27:04 +0200 Subject: [PATCH] Dev Applied custom modifications to Yii 1.1.18 --- framework/web/widgets/captcha/CCaptcha.php | 5 ++++- framework/zii/widgets/assets/gridview/jquery.yiigridview.js | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/framework/web/widgets/captcha/CCaptcha.php b/framework/web/widgets/captcha/CCaptcha.php index 5570203c577..70363975ac3 100644 --- a/framework/web/widgets/captcha/CCaptcha.php +++ b/framework/web/widgets/captcha/CCaptcha.php @@ -128,7 +128,10 @@ public function registerClientScript() $html=CHtml::button($label, $options); else $html=CHtml::link($label, $url, $options); - $js="jQuery('#$id').after(".CJSON::encode($html).");"; + + $js= "if(jQuery('#$id').next('input').length == 0){" + . "jQuery('#$id').after(".CJSON::encode($html)."); + }"; $selector="#$buttonID"; } diff --git a/framework/zii/widgets/assets/gridview/jquery.yiigridview.js b/framework/zii/widgets/assets/gridview/jquery.yiigridview.js index cd19df94f62..25269b67fe8 100644 --- a/framework/zii/widgets/assets/gridview/jquery.yiigridview.js +++ b/framework/zii/widgets/assets/gridview/jquery.yiigridview.js @@ -405,7 +405,11 @@ } this.find('.' + settings.tableClass).children('tbody').children('tr').children('td').children('input[name="' + column_id + '"]').each(function (i) { if (this.checked) { - checked.push(keys.eq(i).text()); + var val = keys.eq(i).text(); + if (val == '') { + val = $(this).val(); + } + checked.push(val); } }); return checked;