Conjunto de cambios 2efe680 en sipes para modules_contrib/ctools/includes/plugins.inc

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/includes/plugins.inc (modificado) (4 diferencias)

modules_contrib/ctools/includes/plugins.inc

@@ -1 +1 @@
 <?php
-// $Id: plugins.inc,v 1.18.2.30 2010/08/25 20:22:22 merlinofchaos Exp $
 
 /**
@@ -277 +276 @@
 
 /**
+ * Reset all static caches that affect the result of ctools_get_plugins().
+ */
+function ctools_get_plugins_reset() {
+  ctools_static_reset('ctools_plugin_load_includes');
+  ctools_static_reset('ctools_plugin_api_info');
+}
+
+/**
  * Load plugins from a directory.
  *
@@ -290 +297 @@
   // Keep a static array so we don't hit drupal_system_listing more than necessary.
   $all_files = &ctools_static(__FUNCTION__, array());
+
+  // store static of plugin arrays for reference because they can't be reincluded.
+  static $plugin_arrays = array();
 
   // If we're being asked for all plugins of a type, skip any caching
@@ -339 +349 @@
         // Parse a hook.
         $plugin = NULL; // ensure that we don't have something leftover from earlier.
-        include_once './' . $file->filename;
-        // .inc files have a special format for the hook identifier.
-        // For example, 'foo.inc' in the module 'mogul' using the plugin
-        // whose hook is named 'borg_type' should have a function named (deep breath)
-        // mogul_foo_borg_type()
-
-        // If, however, the .inc file set the quasi-global $plugin array, we
-        // can use that and not even call a function. Set the $identifier
-        // appropriately and ctools_plugin_process() will handle it.
-        $identifier = isset($plugin) ? $plugin : $module . '_' . $file->name;
+
+        if (isset($plugin_arrays[$file->filename])) {
+          $identifier = $plugin_arrays[$file->filename];
+        }
+        else {
+
+          require_once './' . $file->filename;
+          // .inc files have a special format for the hook identifier.
+          // For example, 'foo.inc' in the module 'mogul' using the plugin
+          // whose hook is named 'borg_type' should have a function named (deep breath)
+          // mogul_foo_borg_type()
+
+          // If, however, the .inc file set the quasi-global $plugin array, we
+          // can use that and not even call a function. Set the $identifier
+          // appropriately and ctools_plugin_process() will handle it.
+          if (isset($plugin)) {
+            $plugin_arrays[$file->filename] = $plugin;
+            $identifier = $plugin;
+          }
+          else {
+            $identifier = $module . '_' . $file->name;
+          }
+        }
         $result = ctools_plugin_process($info, $module, $identifier, dirname($file->filename), basename($file->filename), $file->name);
       }