Fixes #2774 - fixes several E_NOTICE issues - mostly due to accessign array indexes

git-svn-id: http://code.elgg.org/elgg/trunk@7844 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/classes/ElggPluginPackage.php b/engine/classes/ElggPluginPackage.php
index fd54ff731eca481d1a13501fd6f787c7768fe12b..422f777b930edd0a36d38fc932d2a312c9bd5160 100644 (file)
--- a/engine/classes/ElggPluginPackage.php
+++ b/engine/classes/ElggPluginPackage.php
@@ -221,7 +221,7 @@ class ElggPluginPackage {
                                        }
 
                                        // make sure nothing is providing something it conflicts or requires.
-                                       if ($dep['name'] == $name) {
+                                       if (isset($dep['name']) && $dep['name'] == $name) {
                                                $version_compare = version_compare($provide['version'], $dep['version'], $dep['comparison']);
 
                                                if ($version_compare) {

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 497f25953c6c25fdeab8d1261a573fd7cd6ed63b..f925429dea62534ecd3ded1b2fd0f3689bfad258 100644 (file)
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -875,12 +875,19 @@ function unregister_elgg_event_handler($event, $object_type, $callback) {
 function elgg_trigger_event($event, $object_type, $object = null) {
        global $CONFIG;
 
-       $events = array(
-               $CONFIG->events[$event][$object_type],
-               $CONFIG->events['all'][$object_type],
-               $CONFIG->events[$event]['all'],
-               $CONFIG->events['all']['all'],
-       );
+       $events = array();
+       if (isset($CONFIG->events[$event][$object_type])) {
+               $events[] = $CONFIG->events[$event][$object_type];
+       }
+       if (isset($CONFIG->events['all'][$object_type])) {
+               $events[] = $CONFIG->events['all'][$object_type];
+       }
+       if (isset($CONFIG->events[$event]['all'])) {
+               $events[] = $CONFIG->events[$event]['all'];
+       }
+       if (isset($CONFIG->events['all']['all'])) {
+               $events[] = $CONFIG->events['all']['all'];
+       }
 
        $args = array($event, $object_type, $object);
 
@@ -1092,7 +1099,9 @@ function elgg_trigger_plugin_hook($hook, $type, $params = null, $returnvalue = n
        if (isset($CONFIG->hooks[$hook]['all'])) {
                $hooks[] = $CONFIG->hooks[$hook]['all'];
        }
-       $hooks[] = $CONFIG->hooks['all']['all'];
+       if (isset($CONFIG->hooks['all']['all'])) {
+               $hooks[] = $CONFIG->hooks['all']['all'];
+       }
 
        foreach ($hooks as $callback_list) {
                if (is_array($callback_list)) {

diff --git a/engine/lib/metadata.php b/engine/lib/metadata.php
index c15a163b7117b9c72a812e8b025780bdd0284cfa..0ae576328ae054c6a083dccb7e975ff0798c7732 100644 (file)
--- a/engine/lib/metadata.php
+++ b/engine/lib/metadata.php
@@ -854,7 +854,7 @@ $owner_guids = NULL) {
        }
 
        if (is_array($order_by_metadata)) {
-               if ((count($order_by_metadata) > 0) && !is_array($order_by_metadata[0])) {
+               if ((count($order_by_metadata) > 0) && !isset($order_by_metadata[0])) {
                        // singleton, so fix
                        $order_by_metadata = array($order_by_metadata);
                }

diff --git a/engine/lib/views.php b/engine/lib/views.php
index 364f4618e75efaf5357f6ee536f4d72496982c29..c97a214a1444b5f68b3ee174f6c9467fb5ad75d8 100644 (file)
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -581,6 +581,7 @@ function extend_view($view, $view_name, $priority = 501, $viewtype = '') {
  */
 function elgg_view_page($title, $body, $page_shell = 'default', $vars = array()) {
 
+       $messages = null;
        if (count_messages()) {
                // get messages - try for errors first
                $messages = system_messages(NULL, "error");
@@ -857,7 +858,7 @@ function elgg_view_annotation(ElggAnnotation $annotation, $full = true, $bypass
  * @return string The list of entities
  * @access private
  */
-function elgg_view_entity_list($entities, $count, $offset, $limit, $full_view = true,
+function elgg_view_entity_list($entities, $count, $offset = 0, $limit = 10, $full_view = true,
 $list_type_toggle = true, $pagination = true) {
 
        if (!is_int($offset)) {

diff --git a/engine/lib/xml.php b/engine/lib/xml.php
index 0d0d83da0330c7e255ec13e32bb5b162f8f439f5..55ea1b5ad4535cd7a1ac2459655e6ca05e1e0f4c 100644 (file)
--- a/engine/lib/xml.php
+++ b/engine/lib/xml.php
@@ -127,8 +127,8 @@ function xml_to_object($xml) {
                if ($tag['type'] == "complete" || $tag['type'] == "open") {
                        $elements[$index] = new XmlElement;
                        $elements[$index]->name = $tag['tag'];
-                       $elements[$index]->attributes = $tag['attributes'];
-                       $elements[$index]->content = $tag['value'];
+                       $elements[$index]->attributes = elgg_get_array_value('attributes', $tag, '');
+                       $elements[$index]->content = elgg_get_array_value('value', $tag, '');
 
                        if ($tag['type'] == "open") {
                                $elements[$index]->children = array();