small fixes

[phpgitweb.git] / htdocs / lib / graph.class.php

diff --git a/htdocs/lib/graph.class.php b/htdocs/lib/graph.class.php
index 33c36b39e0d0d301c265455f9afc67a2a7860e95..6fdc069c8b2e1d92fd6c97acdb94c70388213aee 100644 (file)
--- a/htdocs/lib/graph.class.php
+++ b/htdocs/lib/graph.class.php
@@ -42,13 +42,16 @@ class graph_data_generator {
                }
                unset($branch);
                if($existing)
-                       continue;
+                       return;
+               $name_arr = array();
+               if($name)
+                       $name_arr[] = $name;
                $this->data['branches'][count($this->data['branches'])] = array(
                        "id" => $this->brach_id++,
                        "uid" => $this->branch_uid++,
                        "active" => true,
                        "sticky" => true,
-                       "name" => array($name),
+                       "name" => $name_arr,
                        "next" => $first_id,
                        "pre_merge" => false
                );
@@ -147,7 +150,7 @@ class graph_data_generator {
                                $branch['active'] = false;
                                $commit['dot_type'] = self::DOT_TYPE_INIT;
                        }
-                       $branch['next'] = (array_key_exists('parent', $commit) ? $commit['parent'][0] : null);
+                       $branch['next'] = ((array_key_exists('parent', $commit) && count($commit['parent'])) ? $commit['parent'][0] : null);
                        $branch['pre_merge'] = false;
                        $this->data['ubranches'][$branch['uid']] = $this->data['branches'][$branch['id']-1];