Merge pull request #3687 from grandoc/3.8

syntax error
This commit is contained in:
Laurent Destailleur 2015-10-09 20:14:08 +02:00
commit be9027df1a
4 changed files with 5 additions and 5 deletions

View File

@ -200,7 +200,7 @@ if (! empty($conf->paybox->enabled) || ! empty($conf->paypal->enabled))
print '<tr '.$bc[$var].' id="tremail"><td>'; print '<tr '.$bc[$var].' id="tremail"><td>';
print $langs->trans("MEMBER_PAYONLINE_SENDEMAIL"); print $langs->trans("MEMBER_PAYONLINE_SENDEMAIL");
print '</td><td align="right">'; print '</td><td align="right">';
print '<input type="text" id="MEMBER_PAYONLINE_SENDEMAIL" name="MEMBER_PAYONLINE_SENDEMAIL" size="24" value="'.(! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL)?$conf->global->MEMBER_PAYONLINE_SENDEMAIL:'').'">';; print '<input type="text" id="MEMBER_PAYONLINE_SENDEMAIL" name="MEMBER_PAYONLINE_SENDEMAIL" size="24" value="'.(! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL)?$conf->global->MEMBER_PAYONLINE_SENDEMAIL:'').'">';
print "</td></tr>\n"; print "</td></tr>\n";
} }

View File

@ -793,7 +793,7 @@ else if ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contra
setEventMessage($object->errors, 'errors'); setEventMessage($object->errors, 'errors');
} }
$result = $object->setValueFrom('ref',GETPOST('ref','alpha'));; $result = $object->setValueFrom('ref',GETPOST('ref','alpha'));
if ($result < 0) { if ($result < 0) {
setEventMessage($object->errors, 'errors'); setEventMessage($object->errors, 'errors');
$action = 'editref'; $action = 'editref';

View File

@ -726,7 +726,7 @@ Handlebars.log = function(level, str) { Handlebars.logger.log(level, str); };
this.comment = comment; this.comment = comment;
}; };
})();; })();
// lib/handlebars/utils.js // lib/handlebars/utils.js
Handlebars.Exception = function(message) { Handlebars.Exception = function(message) {
var tmp = Error.prototype.constructor.apply(this, arguments); var tmp = Error.prototype.constructor.apply(this, arguments);
@ -791,7 +791,7 @@ Handlebars.SafeString.prototype.toString = function() {
} }
} }
}; };
})();; })();
// lib/handlebars/compiler/compiler.js // lib/handlebars/compiler/compiler.js
/*jshint eqnull:true*/ /*jshint eqnull:true*/

View File

@ -156,7 +156,7 @@ Handlebars.SafeString.prototype.toString = function() {
} }
} }
}; };
})();; })();
// lib/handlebars/runtime.js // lib/handlebars/runtime.js
Handlebars.VM = { Handlebars.VM = {
template: function(templateSpec) { template: function(templateSpec) {