← All changes | framework/events/definition.class.php +6 -3 6.0 → 12.0.4 View file →

		@@ -85,11 +85,14 @@
85	85	protected function & extend(& $definition) {
86	86	// Extend events from all base classes!
87	87	foreach ($this->bases as $baseClassName => $options) {
88	88	$baseClass = $this->get($baseClassName);
89		- foreach (((array) $baseClass['events']) as $name => $event) {
90		- $event['type'] = array_merge($event['type'], $options);
91		- $definition['events'][$name] = $event;
	89	+ // E_ALL complain!
	90	+ if (isset($baseClass['events'])) {
	91	+ foreach ($baseClass['events'] as $name => $event) {
	92	+ $event['type'] = array_merge($event['type'], $options);
	93	+ $definition['events'][$name] = $event;
	94	+ }
92	95	}
93	96	}
94	97	return $definition;
95	98	}