harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #316 from dawnbreak/master

Browse Source 
Make asset icons work in subdir installs as well.
This commit is contained in:
friendica 2014-02-17 15:11:05 +11:00
commit f38ab09041
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/items.php
View File

@ -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();

2
include/reddav.php
View File

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