From 79a2e3f1a7debdf62c66797446b2615e0a55000c Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Mon, 3 Oct 2011 21:47:18 -0700 Subject: Use a stdClass wrapper around the data in the before_combine and after_combine events so that event handlers can modify the data. Fixes #1789. --- modules/gallery/libraries/Gallery_View.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'modules') diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php index e04b9169..9c672770 100644 --- a/modules/gallery/libraries/Gallery_View.php +++ b/modules/gallery/libraries/Gallery_View.php @@ -157,7 +157,10 @@ class Gallery_View_Core extends View { $contents = $cache->get($key); if (empty($contents)) { - module::event("before_combine", $type, $this->combine_queue[$type][$group]); + $combine_data = new stdClass(); + $combine_data->type = $type; + $combine_data->contents = $this->combine_queue[$type][$group]; + module::event("before_combine", $combine_data); $contents = ""; foreach (array_keys($this->combine_queue[$type][$group]) as $path) { @@ -168,14 +171,17 @@ class Gallery_View_Core extends View { } } - module::event("after_combine", $type, $contents); + $combine_data = new stdClass(); + $combine_data->type = $type; + $combine_data->contents = $contents; + module::event("after_combine", $combine_data); - $cache->set($key, $contents, array($type), 30 * 84600); + $cache->set($key, $combine_data->contents, array($type), 30 * 84600); $use_gzip = function_exists("gzencode") && (int) ini_get("zlib.output_compression") === 0; if ($use_gzip) { - $cache->set("{$key}_gz", gzencode($contents, 9, FORCE_GZIP), + $cache->set("{$key}_gz", gzencode($combine_data->contents, 9, FORCE_GZIP), array($type, "gzip"), 30 * 84600); } -- cgit v1.2.3