浏览代码

Fixed regression (shortcut actions, display a list of objects not deriving from cmdbAbstract)

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@1510 a333f486-631f-4898-b8df-5754b55c2be0
romainq 13 年之前
父节点
当前提交
13440f0403
共有 1 个文件被更改,包括 12 次插入5 次删除
  1. 12 5
      application/displayblock.class.inc.php

+ 12 - 5
application/displayblock.class.inc.php

@@ -1229,15 +1229,22 @@ class MenuBlock extends DisplayBlock
 		}
 		$aFavoriteActions = array();
 		$aCallSpec = array($sClass, 'GetShortcutActions');
-		$aShortcutActions = call_user_func($aCallSpec, $sClass);
-		foreach ($aActions as $key => $aAction)
+		if (is_callable($aCallSpec))
 		{
-			if (in_array($key, $aShortcutActions))
+			$aShortcutActions = call_user_func($aCallSpec, $sClass);
+			foreach ($aActions as $key => $aAction)
 			{
-				$aFavoriteActions[] = $aAction;
-				unset($aActions[$key]);
+				if (in_array($key, $aShortcutActions))
+				{
+					$aFavoriteActions[] = $aAction;
+					unset($aActions[$key]);
+				}
 			}
 		}
+		else
+		{
+			$aShortcutActions = array();
+		}
 		
 		if (count($aFavoriteActions) > 0)
 		{