aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2009-12-11 12:30:23 +0000
committerCash Costello <cash.costello@gmail.com>2009-12-11 12:30:23 +0000
commit3bd5e571364385cb93a93b8526e1e90e56db7b49 (patch)
tree1536e0b02dc1a4739368a2e83cb0ec971d0f2ee6 /views
parent622dca92b2a8eb399e7b2b44a682d7dd682dc68c (diff)
downloadelgg-3bd5e571364385cb93a93b8526e1e90e56db7b49.tar.gz
elgg-3bd5e571364385cb93a93b8526e1e90e56db7b49.tar.bz2
moved download action to download page
Diffstat (limited to 'views')
-rw-r--r--views/default/object/image.php2
-rw-r--r--views/default/tidypics/image_menu.php2
-rw-r--r--views/rss/object/album.php4
-rw-r--r--views/rss/object/file.php2
4 files changed, 5 insertions, 5 deletions
diff --git a/views/default/object/image.php b/views/default/object/image.php
index dd52f872e..fb7a72ff8 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -150,7 +150,7 @@
$image_link = false;
if (get_plugin_setting('download_link', 'tidypics') != "disabled") {
// admin allows downloads so default to inline download link
- $image_link = $vars['url'] . "action/tidypics/download?file_guid=" . $image_guid . "&amp;view=inline";
+ $image_link = $vars['url'] . "pg/photos/download/{$image_guid}/inline/";
}
// does any plugin want to override the link
$image_link = trigger_plugin_hook('tp_image_link', 'image', $image, $image_link);
diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php
index 5e6053a94..9e7a53969 100644
--- a/views/default/tidypics/image_menu.php
+++ b/views/default/tidypics/image_menu.php
@@ -43,7 +43,7 @@
}
if (get_plugin_setting('download_link', 'tidypics') != "disabled") {
- $download_url = $vars['url'] . "action/tidypics/download?file_guid=" . $image_guid;
+ $download_url = $vars['url'] . "pg/photos/download/{$image_guid}/";
?>
<li id="download_image"><a href="<?php echo $download_url; ?>"><?php echo elgg_echo("image:download"); ?></a></li>
<?php
diff --git a/views/rss/object/album.php b/views/rss/object/album.php
index c66c0f7e9..c59f0e2d3 100644
--- a/views/rss/object/album.php
+++ b/views/rss/object/album.php
@@ -12,7 +12,7 @@
$base_url = $vars['url'] . 'mod/tidypics/thumbnail.php?file_guid=';
// use fullsize image
- $base_url_fullsize = $vars['url'] . 'action/tidypics/download?file_guid=';
+ $base_url_fullsize = $vars['url'] . 'pg/photos/download/';
// insert cover image if it exists image
if ($album->cover) {
@@ -52,7 +52,7 @@
<description><?php echo htmlentities($descr, ENT_QUOTES); ?></description>
<pubDate><?php echo date("r", $image->time_created); ?></pubDate>
<guid isPermaLink="true"><?php echo $image->getURL(); ?></guid>
- <media:content url="<?php echo $base_url_fullsize . $image->guid . '&amp;view=inline'; ?>" medium="image" type="<?php echo $image->getMimeType(); ?>" />
+ <media:content url="<?php echo $base_url_fullsize . $image->guid . '/inline/'; ?>" medium="image" type="<?php echo $image->getMimeType(); ?>" />
<media:title><?php echo $image->title; ?></media:title>
<media:description><?php echo htmlentities($image->description); ?></media:description>
<media:thumbnail url="<?php echo $base_url . $image->guid . '&amp;size=thumb'; ?>"></media:thumbnail>
diff --git a/views/rss/object/file.php b/views/rss/object/file.php
index ace3e28e6..e40da4f69 100644
--- a/views/rss/object/file.php
+++ b/views/rss/object/file.php
@@ -19,5 +19,5 @@
<link><?php echo $vars['entity']->getURL(); ?></link>
<title><![CDATA[<?php echo $title; ?>]]></title>
<description><![CDATA[<?php echo (autop($vars['entity']->description)); ?>]]></description>
- <enclosure url="<?php echo $vars['url']; ?>action/file/download?file_guid=<?php echo $vars['entity']->getGUID(); ?>" length="<?php echo $vars['entity']->size(); ?>" type="<?php echo $vars['entity']->getMimeType(); ?>" />
+ <enclosure url="<?php echo $vars['url']; ?>pg/photos/download/<?php echo $vars['entity']->getGUID(); ?>/" length="<?php echo $vars['entity']->size(); ?>" type="<?php echo $vars['entity']->getMimeType(); ?>" />
</item>