Conjunto de cambios 2efe680 en sipes para modules_contrib/ctools/ctools.module

Fecha y hora:

26/05/2016 18:16:05 (hace 8 años)

Autor:

José Gregorio Puentes <jpuentes@…>

Branches:

stable, version-3.0

Children:

dafc8d8

Parents:

49072ea

Mensaje:

se actualizo el modulo

Fichero:

• modules_contrib/ctools/ctools.module (modificado) (9 diferencias)

modules_contrib/ctools/ctools.module

@@ -1 +1 @@
 <?php
-// $Id: ctools.module,v 1.27.2.50 2010/10/15 22:11:09 merlinofchaos Exp $
 
 /**
@@ -11 +10 @@
  */
 
-define('CTOOLS_API_VERSION', '1.8');
+define('CTOOLS_API_VERSION', '1.9');
 
 /**
@@ -331 +330 @@
  */
 function ctools_set_callback_token($token, $callback) {
+  // If the callback uses arguments they are considered in the token.
+  if (is_array($callback)) {
+    $token .= '-' . md5(serialize($callback));
+  }
   $string = '<!-- ctools-page-' . $token . ' -->';
   ctools_set_page_token($string, 'callback', $callback);
@@ -392 +395 @@
   ctools_include('utility');
   $items = array();
-  _ctools_passthrough($items, 'theme');
+  ctools_passthrough('ctools', 'theme', $items);
   return $items;
 }
@@ -402 +405 @@
   ctools_include('utility');
   $items = array();
-  _ctools_passthrough($items, 'menu');
+  ctools_passthrough('ctools', 'menu', $items);
   return $items;
 }
@@ -411 +414 @@
 function ctools_cron() {
   ctools_include('utility');
-  _ctools_passthrough($items, 'cron');
+  $items = array();
+  ctools_passthrough('ctools', 'cron', $items);
 }
 
@@ -440 +444 @@
 
   return $forms;
+}
+
+/**
+ * Implements hook_form_alter().
+ */
+function ctools_form_alter(&$form, $form_state, $form_id) {
+  $form['#after_build'][] = 'ctools_ajax_form_after_build';
+}
+
+/**
+ * #after_build callback: Mark the $form['#action'] as a trusted URL for Ajax.
+ */
+function ctools_ajax_form_after_build($form, $form_state) {
+  $settings = array(
+    'CToolsUrlIsAjaxTrusted' => array(
+      $form['#action'] => TRUE,
+    ),
+  );
+  drupal_add_js($settings, 'setting');
+  return $form;
 }
 
@@ -486 +510 @@
     foreach ($replacements as $type => $type_replacements) {
       foreach ($type_replacements as $old_path => $new_filename) {
-        $replacements[$type][$old_path] = JQUERY_UPDATE_REPLACE_PATH . "/$new_filename";
+        $replacements[$type][$old_path] = drupal_get_path('module', 'jquery_update') . "/replace/$new_filename";
       }
     }
@@ -542 +566 @@
   $tokens = ctools_set_page_token();
   if (!empty($tokens)) {
+    $temp_tokens = array();
     foreach ($tokens as $token => $key) {
       list($type, $argument) = $key;
       switch ($type) {
         case 'variable':
-          $tokens[$token] = isset($variables[$argument]) ? $variables[$argument] : '';
+          $temp_tokens[$token] = isset($variables[$argument]) ? $variables[$argument] : '';
           break;
         case 'callback':
           if (is_string($argument) && function_exists($argument)) {
-            $tokens[$token] = $argument($variables);
+            $temp_tokens[$token] = $argument($variables);
           }
           if (is_array($argument) && function_exists($argument[0])) {
             $function = array_shift($argument);
             $argument = array_merge(array(&$variables), $argument);
-            $tokens[$token] = call_user_func_array($function, $argument);
+            $temp_tokens[$token] = call_user_func_array($function, $argument);
           }
           break;
       }
     }
+    $tokens = $temp_tokens;
+    unset($temp_tokens);
     $variables['content'] = strtr($variables['content'], $tokens);
   }