diff options
Diffstat (limited to 'engine/lib/elgglib.php')
| -rw-r--r-- | engine/lib/elgglib.php | 20 | 
1 files changed, 12 insertions, 8 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 92fb03c88..404c818a9 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -1187,42 +1187,46 @@  	 */
  		function trigger_plugin_hook($hook, $entity_type, $params = null, $returnvalue = null) {
  			global $CONFIG;
 -		
 +	
  			//if (!isset($CONFIG->hooks) || !isset($CONFIG->hooks[$hook]) || !isset($CONFIG->hooks[$hook][$entity_type]))
  			//	return $returnvalue;
  			if (!empty($CONFIG->hooks[$hook][$entity_type]) && is_array($CONFIG->hooks[$hook][$entity_type])) {
 -				foreach($CONFIG->hooks[$hook][$entity_type] as $hookfunction) {
 +				foreach($CONFIG->hooks[$hook][$entity_type] as $hookfunction) { +					
  					$temp_return_value = $hookfunction($hook, $entity_type, $returnvalue, $params);
  					if (!is_null($temp_return_value)) $returnvalue = $temp_return_value;
  				}
  			}
 -			
 +			else
  			//if (!isset($CONFIG->hooks['all'][$entity_type]))
  			//	return $returnvalue;
  			if (!empty($CONFIG->hooks['all'][$entity_type]) && is_array($CONFIG->hooks['all'][$entity_type])) {
 -				foreach($CONFIG->hooks['all'][$entity_type] as $hookfunction) {
 +				foreach($CONFIG->hooks['all'][$entity_type] as $hookfunction) { +					
  					$temp_return_value = $hookfunction($hook, $entity_type, $returnvalue, $params);
  					if (!is_null($temp_return_value)) $returnvalue = $temp_return_value;
  				}
  			}
 -			
 +			else
  			//if (!isset($CONFIG->hooks[$hook]['all']))
  			//	return $returnvalue;
  			if (!empty($CONFIG->hooks[$hook]['all']) && is_array($CONFIG->hooks[$hook]['all'])) {
 -				foreach($CONFIG->hooks[$hook]['all'] as $hookfunction) {
 +				foreach($CONFIG->hooks[$hook]['all'] as $hookfunction) { +					
  					$temp_return_value = $hookfunction($hook, $entity_type, $returnvalue, $params);
  					if (!is_null($temp_return_value)) $returnvalue = $temp_return_value;
  				}
  			}
 -			
 +			else
  			//if (!isset($CONFIG->hooks['all']['all']))
  			//	return $returnvalue;
  			if (!empty($CONFIG->hooks['all']['all']) && is_array($CONFIG->hooks['all']['all'])) {
 -				foreach($CONFIG->hooks['all']['all'] as $hookfunction) {
 +				foreach($CONFIG->hooks['all']['all'] as $hookfunction) { +					
  					$temp_return_value = $hookfunction($hook, $entity_type, $returnvalue, $params);
  					if (!is_null($temp_return_value)) $returnvalue = $temp_return_value;
  				}
  | 
