Did a git pull, but had to manually merge a conflict.

1 files changed, 8 insertions, 6 deletions

diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php
index 06620ae2..1f233038 100644
--- a/modules/tag/models/tag.php
+++ b/modules/tag/models/tag.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 Bharat Mediratta
+ * Copyright (C) 2000-2011 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -79,12 +79,14 @@ class Tag_Model_Core extends ORM {
       $related_item_ids[$row->item_id] = 1;
     }
 
-    $added = array_diff($this->changed_relations["items"], $this->object_relations["items"]);
-    $removed = array_diff($this->object_relations["items"], $this->changed_relations["items"]);
-    if (isset($this->changed_relations["items"])) {
-      $changed = array_merge($added, $removed);
+    if (isset($this->object_relations["items"])) {
+      $added = array_diff($this->changed_relations["items"], $this->object_relations["items"]);
+      $removed = array_diff($this->object_relations["items"], $this->changed_relations["items"]);
+      if (isset($this->changed_relations["items"])) {
+        $changed = array_merge($added, $removed);
+      }
+      $this->count = count($this->object_relations["items"]) + count($added) - count($removed);
     }
-    $this->count = count($this->object_relations["items"]) + count($added) - count($removed);
 
     $result = parent::save();