Revert "customcommands: relax restriction on execCC from command temp…

…lates (botlabs-gg#1684)"

This reverts commit cd13c54.

customcommands/tmplextensions.go

@@ -176,7 +176,7 @@ func (pa *ParsedArgs) IsSet(index int) interface{} {
 // or schedules a custom command to be run in the future sometime with the provided data placed in .ExecData
 func tmplRunCC(ctx *templates.Context) interface{} {
 	return func(ccID int, channel interface{}, delaySeconds interface{}, data interface{}) (string, error) {
-		if ctx.ExecutedFrom == templates.ExecutedFromNestedCommandTemplate {
+		if ctx.ExecutedFrom == templates.ExecutedFromCommandTemplate || ctx.ExecutedFrom == templates.ExecutedFromNestedCommandTemplate {
 			return "", nil
 		}