From: Jan Schneider <jan@horde.org>
Date: Wed, 28 Jul 2010 16:44:20 +0000 (+0200)
Subject: Thank you, failing git merge.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=81c121f7b46ef9cb08956636ebbef0ded70796f9;p=horde.git

Thank you, failing git merge.
---

diff --git a/ansel/lib/Ansel.php b/ansel/lib/Ansel.php
index 93e9029d6..f1acedbd9 100644
--- a/ansel/lib/Ansel.php
+++ b/ansel/lib/Ansel.php
@@ -264,7 +264,7 @@ class Ansel
                     if ($data['view'] == 'Image' &&
                         !empty($data['gallery_view']) &&
                         $data['gallery_view'] == 'GalleryLightbox') {
-                        $url->addAnchor($data['image']);
+                        $url->setAnchor($data['image']);
                     }
 
                 } elseif ($data['view'] == 'Results')  {
@@ -303,7 +303,7 @@ class Ansel
                     !empty($data['gallery_view']) &&
                     $data['gallery_view'] == 'GalleryLightbox') {
                     $data['view'] = 'Gallery';
-                    $url->addAnchor($data['image']);
+                    $url->setAnchor($data['image']);
                 }
 
                 return $url->add($data)->setRaw(true);
diff --git a/framework/Url/test/Horde/Url/AddTest.php b/framework/Url/test/Horde/Url/AddTest.php
index c2e673d63..661eb61cc 100644
--- a/framework/Url/test/Horde/Url/AddTest.php
+++ b/framework/Url/test/Horde/Url/AddTest.php
@@ -21,7 +21,7 @@ class Horde_Url_AddTest extends PHPUnit_Framework_TestCase
         $url->add('fez');
         $this->assertEquals('test?foo=1&amp;bar=2&amp;baz=3&amp;fez', (string)$url);
 
-        $url->addAnchor('boo');
+        $url->setAnchor('boo');
         $this->assertEquals('test?foo=1&amp;bar=2&amp;baz=3&amp;fez#boo', (string)$url);
         $url->setAnchor('bee');
         $this->assertEquals('test?foo=1&amp;bar=2&amp;baz=3&amp;fez#bee', (string)$url);
@@ -102,14 +102,14 @@ class Horde_Url_AddTest extends PHPUnit_Framework_TestCase
     public function testParseUrlAnchor()
     {
         $url = new Horde_Url('test?foo=1#bar');
-        $url->addAnchor('baz');
+        $url->setAnchor('baz');
         $this->assertEquals('test?foo=1#baz', (string)$url);
     }
 
     public function testEncodeAnchor()
     {
         $url = new Horde_Url('test');
-        $url->addAnchor('a@b.com');
+        $url->setAnchor('a@b.com');
         $this->assertEquals('test#a%40b.com', (string)$url);
     }
 
diff --git a/framework/Url/test/Horde/Url/RemoveTest.php b/framework/Url/test/Horde/Url/RemoveTest.php
index c86837350..0bfddba91 100644
--- a/framework/Url/test/Horde/Url/RemoveTest.php
+++ b/framework/Url/test/Horde/Url/RemoveTest.php
@@ -24,7 +24,7 @@ class Horde_Url_RemoveTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('test?bar=2&baz=3', (string)$url->remove('foo'));
 
         $url = new Horde_Url('test?foo=1#baz');
-        $url->addAnchor('');
+        $url->setAnchor('');
         $this->assertEquals('test?foo=1', (string)$url);
     }
 
@@ -43,7 +43,7 @@ class Horde_Url_RemoveTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('test?bar=2&amp;baz=3', (string)$url->remove('foo'));
 
         $url = new Horde_Url('test?foo=1&amp;bar=2#baz');
-        $url->addAnchor('');
+        $url->setAnchor('');
         $this->assertEquals('test?foo=1&amp;bar=2', (string)$url);
     }
 
diff --git a/horde/admin/datatree.php b/horde/admin/datatree.php
index 53c2b3828..ff1130e25 100644
--- a/horde/admin/datatree.php
+++ b/horde/admin/datatree.php
@@ -18,7 +18,7 @@ function _addTree($parent, $parent_id, $datatree, $tree, $indent = 1)
 
     foreach ($nodes as $id => $node) {
         if ($id != $parent_id) {
-            $node_url = $url->copy()->add('show', $datatree->getParam('group') . ':' . $id)->addAnchor('show');
+            $node_url = $url->copy()->add('show', $datatree->getParam('group') . ':' . $id)->setAnchor('show');
 
             $tree->addNode($parent . ':' . $id, $parent, $datatree->getShortName($node), $indent, false, array('url' => strval($node_url)));
             _addTree($parent . ':' . $id, $id, $datatree, $tree, $indent + 1);