aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-17 15:11:05 +1100
committerfriendica <info@friendica.com>2014-02-17 15:11:05 +1100
commitf38ab0904101366bf536d46ab460dcd5cf4f60ca (patch)
treec6679ddb544217a10d8255578009c4ba8951bc6b
parentdf22a7893614a2d3e5cba6614bd254f59257a5f5 (diff)
parent29f6a1ee33b27886afc135e05ecac592651bb7b2 (diff)
downloadvolse-hubzilla-f38ab0904101366bf536d46ab460dcd5cf4f60ca.tar.gz
volse-hubzilla-f38ab0904101366bf536d46ab460dcd5cf4f60ca.tar.bz2
volse-hubzilla-f38ab0904101366bf536d46ab460dcd5cf4f60ca.zip
Merge pull request #316 from dawnbreak/master
Make asset icons work in subdir installs as well.
-rwxr-xr-xinclude/items.php20
-rw-r--r--include/reddav.php2
2 files changed, 1 insertions, 21 deletions
diff --git a/include/items.php b/include/items.php
index bf575860a..c90bfb41c 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3638,26 +3638,6 @@ function posted_dates($uid,$wall) {
}
-function posted_date_widget($url,$uid,$wall) {
- $o = '';
-
- if(! feature_enabled($uid,'archives'))
- return $o;
-
- $ret = posted_dates($uid,$wall);
- if(! count($ret))
- return $o;
-
- $o = replace_macros(get_markup_template('posted_date_widget.tpl'),array(
- '$title' => t('Archives'),
- '$size' => ((count($ret) > 6) ? 6 : count($ret)),
- '$url' => $url,
- '$dates' => $ret
- ));
- return $o;
-}
-
-
function fetch_post_tags($items,$link = false) {
$tag_finder = array();
diff --git a/include/reddav.php b/include/reddav.php
index cb2aa3bb9..6182aeacd 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -1072,7 +1072,7 @@ class RedBrowser extends DAV\Browser\Plugin {
* @return string
*/
protected function getAssetUrl($assetName) {
- return '/cloud/?sabreAction=asset&assetName=' . urlencode($assetName);
+ return z_root() .'/cloud/?sabreAction=asset&assetName=' . urlencode($assetName);
}
}