aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--languages/es.php4
-rw-r--r--views/default/forms/photos/admin/settings/main.php1
-rw-r--r--views/default/icon/object/album.php1
-rw-r--r--views/default/icon/object/image.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/languages/es.php b/languages/es.php
index efe65d976..3dacebee8 100644
--- a/languages/es.php
+++ b/languages/es.php
@@ -68,8 +68,8 @@ $spanish = array(
//actions
'album:create' => "Crear nuevo álbum",
- 'album:add' => "Añadir Álbum de fotos",
- 'album:addpix' => "ñadir fotos al Álbum",
+ 'album:add' => "Añadir álbum de fotos",
+ 'album:addpix' => "Añadir fotos al álbum",
'album:edit' => "Editar álbum",
'album:delete' => "Borrar álbum",
'image:edit' => "Editar imagen",
diff --git a/views/default/forms/photos/admin/settings/main.php b/views/default/forms/photos/admin/settings/main.php
index f7950a7ad..8791742f1 100644
--- a/views/default/forms/photos/admin/settings/main.php
+++ b/views/default/forms/photos/admin/settings/main.php
@@ -8,7 +8,6 @@ $plugin = $vars['plugin'];
$checkboxes = array('tagging', 'view_count', 'exif', 'download_link');
foreach ($checkboxes as $checkbox) {
echo '<div>';
- $checked = $plugin->$checkbox ? 'checked' : false;
echo elgg_view('input/checkbox', array(
'name' => "params[$checkbox]",
'value' => true,
diff --git a/views/default/icon/object/album.php b/views/default/icon/object/album.php
index 656b2e0df..55bb7451b 100644
--- a/views/default/icon/object/album.php
+++ b/views/default/icon/object/album.php
@@ -17,6 +17,7 @@ $album = $vars['entity'];
$cover_guid = $album->getCoverImageGuid();
if ($cover_guid) {
$vars['title'] = $album->getTitle();
+ $vars['href'] = $album->getURL();
echo elgg_view_entity_icon(get_entity($cover_guid), $vars['size'], $vars);
} else {
$url = "mod/tidypics/graphics/empty_album.png";
diff --git a/views/default/icon/object/image.php b/views/default/icon/object/image.php
index 3dbced8ab..9087fc3d8 100644
--- a/views/default/icon/object/image.php
+++ b/views/default/icon/object/image.php
@@ -27,7 +27,7 @@ if (!isset($vars['title'])) {
$title = $vars['title'];
}
-$url = $entity->getURL();
+$url = isset($vars['href']) ? $vars['href'] : $entity->getURL();
if (isset($vars['href'])) {
$url = $vars['href'];
}