Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

diff --git a/actions/showgroup.php b/actions/showgroup.php
index 340e1833300a2615e38bba46ace3ad8151572ba9..c20941a35ee07776acb475fd69152e4b139b79b4 100644 (file)
--- a/actions/showgroup.php
+++ b/actions/showgroup.php
@@ -244,7 +244,7 @@ class ShowgroupAction extends Action
         if ($this->group->location) {
             $this->elementStart('dl', 'entity_location');
             $this->element('dt', null, _('Location'));
-            $this->element('dd', 'location', $this->group->location);
+            $this->element('dd', 'label', $this->group->location);
             $this->elementEnd('dl');
         }
 

diff --git a/actions/showstream.php b/actions/showstream.php
index 0ee5d769e1f84336258f9f02ab7fc6014818c2c0..c736c99b5db774ee78e18563fa903893ca52fd81 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -262,7 +262,7 @@ class ShowstreamAction extends Action
         if ($this->profile->location) {
             $this->elementStart('dl', 'entity_location');
             $this->element('dt', null, _('Location'));
-            $this->element('dd', 'location', $this->profile->location);
+            $this->element('dd', 'label', $this->profile->location);
             $this->elementEnd('dl');
         }
 

diff --git a/actions/tagother.php b/actions/tagother.php
index 3e8a12fd693d3d78a3717530dee6e31ec35795b9..79151c91184a7c7e3642eefea49c48c2fe579c10 100644 (file)
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -110,7 +110,7 @@ class TagotherAction extends Action
         if ($this->profile->location) {
             $this->elementStart('dl', 'entity_location');
             $this->element('dt', null, _('Location'));
-            $this->element('dd', 'location', $this->profile->location);
+            $this->element('dd', 'label', $this->profile->location);
             $this->elementEnd('dl');
         }
         if ($this->profile->homepage) {

diff --git a/lib/grouplist.php b/lib/grouplist.php
index 4c448e250d5011b13d3d8280fac33c97cf482bd5..6801ab42617eb40d876fecccba72066c0c2e2ba4 100644 (file)
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -124,7 +124,7 @@ class GroupList extends Widget
         if ($this->group->location) {
             $this->out->elementStart('dl', 'entity_location');
             $this->out->element('dt', null, _('Location'));
-            $this->out->elementStart('dd', 'location');
+            $this->out->elementStart('dd', 'label');
             $this->out->raw($this->highlight($this->group->location));
             $this->out->elementEnd('dd');
             $this->out->elementEnd('dl');

diff --git a/lib/profilelist.php b/lib/profilelist.php
index 4d924b039e9647fd329240044a9874d11a9ead59..8bef49dceeefc0885576274a86e7adc786a0dee1 100644 (file)
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -123,7 +123,7 @@ class ProfileList extends Widget
         if ($this->profile->location) {
             $this->out->elementStart('dl', 'entity_location');
             $this->out->element('dt', null, _('Location'));
-            $this->out->elementStart('dd', 'location');
+            $this->out->elementStart('dd', 'label');
             $this->out->raw($this->highlight($this->profile->location));
             $this->out->elementEnd('dd');
             $this->out->elementEnd('dl');