Merge branch 'master' of https://github.com/inboundnow/inbound-pro in…

…to release/1.9.9.7.8
inboundnow · Aug 26, 2020 · edf6462 · edf6462
2 parents ffa1d64 + f2bf05f
commit edf6462
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/classes/class.extension-loader.php b/classes/class.extension-loader.php
@@ -36,6 +36,7 @@ public static function load_extensions() {
         }
 
 		$configuration = Inbound_Options_API::get_option( 'inbound-pro' , 'configuration' , array() );
+
 		foreach( $configuration as $key => $extension){
 
 			if ( $extension['status'] != 'installed' || $extension['download_type'] != 'extension' || !isset($extension['filename']) ) {

diff --git a/core/automation/classes/class.definitions.loader.php b/core/automation/classes/class.definitions.loader.php
@@ -151,6 +151,10 @@ public static function define_arguments() {
                                 $arg_value = json_encode($arg_value);
                             }
 
+                            if (strlen($arg_value)>1000) {
+                                $arg_value = substr($arg_value,0,1000).'...';
+                            }
+
                             $keys[$id . ':' . $arg_key] = $arg_key . ' (' . $arg_value . ')';
                         }
 
@@ -543,7 +547,7 @@ public static function generate_arguments($hook, $args) {
                 if (isset(self::$instance->inbound_arguments[$hook][$definition['id']]) && is_array(self::$instance->inbound_arguments[$hook][$definition['id']])) {
                     self::$instance->inbound_arguments[$hook][$definition['id']] = array_replace(self::$instance->inbound_arguments[$hook][$definition['id']], $updated_arg_data);
                 } else {
-                   self::$instance->inbound_arguments[$hook][$definition['id']] = $updated_arg_data;
+                    self::$instance->inbound_arguments[$hook][$definition['id']] = $updated_arg_data;
                 }
 
             }
@@ -632,7 +636,6 @@ public static function flatten_array($array) {
          */
         public static function update_arguments() {
             if (self::$instance->inbound_arguments) {
-                //error_log(print_r( self::$instance->inbound_arguments,true));
                 Inbound_Options_API::update_option('inbound_automation', 'arguments', self::$instance->inbound_arguments);
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,7 @@ public static function load_extensions() { @@
             }
     		$configuration = Inbound_Options_API::get_option( 'inbound-pro' , 'configuration' , array() );
     		foreach( $configuration as $key => $extension){
     			if ( $extension['status'] != 'installed' || $extension['download_type'] != 'extension' || !isset($extension['filename']) ) {
@@ Expand Down @@