summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-04-24 21:33:34 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-04-24 21:33:34 +0200
commit684007bbaefe0bb415a1903e2807809623c4b250 (patch)
treee8af4c5a1e72b90274710133a45ed22c2e787f18 /core
parent0b06eff3a016a274b5f5f01ec1ff225da7d7b639 (diff)
downloadnextcloud-server-684007bbaefe0bb415a1903e2807809623c4b250.tar.gz
nextcloud-server-684007bbaefe0bb415a1903e2807809623c4b250.zip
fix pathes in contacts
Diffstat (limited to 'core')
-rw-r--r--core/js/js.js9
-rw-r--r--core/templates/layout.user.php1
2 files changed, 10 insertions, 0 deletions
diff --git a/core/js/js.js b/core/js/js.js
index b4482185509..25de7c13b74 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -31,6 +31,7 @@ t.cache={};
OC={
webroot:oc_webroot,
+ appswebroot:oc_appswebroot,
currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false,
coreApps:['admin','log','search','settings','core','3rdparty'],
/**
@@ -54,6 +55,14 @@ OC={
var link=OC.webroot;
if(file.substring(file.length-3) == 'php' && !isCore){
link+='/?app=' + app + '&getfile=' + encodeURI(type + '/' + file);
+ }else if(file.substring(file.length-3) != 'php' && !isCore){
+ link=OC.appswebroot;
+ link+='apps/';
+ link+=app;
+ if(type){
+ link+=type+'/';
+ }
+ link+=file;
}else{
link+='/';
app+='/';
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 61eb0de9f42..a5431ab6ab3 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -9,6 +9,7 @@
<?php endforeach; ?>
<script type="text/javascript">
var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
+ var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>;'
var oc_current_user = '<?php echo OC_User::getUser() ?>';
</script>
<?php foreach($_['jsfiles'] as $jsfile): ?>