Merge pull request #316 from dawnbreak/master

Make asset icons work in subdir installs as well.

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);
     }
 
 }