Explorar o código

Merge branch 'master' of https://github.com/unaio/una

AntonLV %!s(int64=4) %!d(string=hai) anos
pai
achega
376b0b17c9
Modificáronse 2 ficheiros con 4 adicións e 1 borrados
  1. 3 0
      inc/classes/BxDolUploader.php
  2. 1 1
      modules/boonex/tasks/js/tasks.js

+ 3 - 0
inc/classes/BxDolUploader.php

@@ -237,6 +237,9 @@ abstract class BxDolUploader extends BxDolFactory
 
     public function getUploadErrorMessages ($sFormat = 'HTML')
     {
+        if (!$this->_sUploadErrorMessages)
+            return '';
+
         if ('HTML' == $sFormat)
             return nl2br($this->_sUploadErrorMessages);
         else

+ 1 - 1
modules/boonex/tasks/js/tasks.js

@@ -21,7 +21,7 @@ BxTasksView.prototype.init = function () {
 
 BxTasksView.prototype.setCompleted = function (iId, oObj) {
     var $this = this;
-	var iVal = ($(oObj).attr('checked') != 'checked' ? 0 : 1);
+	var iVal = ($(oObj).prop('checked') ? 1 : 0);
 	$this._setCompleted(iId, iVal);
 }