aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-07-13 22:43:52 -0400
committerCash Costello <cash.costello@gmail.com>2012-07-13 22:43:52 -0400
commit919ae814fa2b651072b5bbb901e2183220a0dd30 (patch)
tree2c6a8c50486da6deecb9a6413b62e734c2cc5c44 /views
parente790d7ec5d74c5a2279d6bd73e2508eb18209da9 (diff)
parente6e33ca1a7afb00a855f57df5a5263674b23c93c (diff)
downloadelgg-919ae814fa2b651072b5bbb901e2183220a0dd30.tar.gz
elgg-919ae814fa2b651072b5bbb901e2183220a0dd30.tar.bz2
Pull in several small fixes from Brett's fork
Diffstat (limited to 'views')
-rw-r--r--views/default/forms/photos/admin/settings.php2
-rw-r--r--views/default/object/album/full.php10
2 files changed, 3 insertions, 9 deletions
diff --git a/views/default/forms/photos/admin/settings.php b/views/default/forms/photos/admin/settings.php
index f4bafce78..16d5eb0ce 100644
--- a/views/default/forms/photos/admin/settings.php
+++ b/views/default/forms/photos/admin/settings.php
@@ -42,7 +42,7 @@ echo elgg_view('input/dropdown', array(
echo '</div>';
echo '<div>';
echo elgg_echo('tidypics:settings:im_path') . ' ';
-echo elgg_view("input/text", array('name' => 'params[im_path]', 'value' => $$plugin->im_path));
+echo elgg_view("input/text", array('name' => 'params[im_path]', 'value' => $plugin->im_path));
echo '</div>';
diff --git a/views/default/object/album/full.php b/views/default/object/album/full.php
index ceb8b97aa..7b273c66e 100644
--- a/views/default/object/album/full.php
+++ b/views/default/object/album/full.php
@@ -48,14 +48,8 @@ if ($album->description) {
'class' => 'mbm',
));
}
-$body .= tidypics_list_photos(array(
- 'container_guid' => $album->getGUID(),
- 'limit' => 16,
- 'full_view' => false,
- 'list_type' => 'gallery',
- 'list_type_toggle' => false,
- 'gallery_class' => 'tidypics-gallery',
-));
+
+$body .= $album->viewImages();
echo elgg_view('object/elements/full', array(
'entity' => $album,