diff options
| author | Sam Tuke <samtuke@owncloud.com> | 2013-01-31 16:30:37 +0000 |
|---|---|---|
| committer | Sam Tuke <samtuke@owncloud.com> | 2013-01-31 16:30:37 +0000 |
| commit | 31e723a907399d7d33a0699da082164055f79b3e (patch) | |
| tree | 7da079cc3db0a46512da1b02cc19307337d9ce54 /lib/templatelayout.php | |
| parent | c7b1bdf00e65cca2a42d77fc5f27d0ea69e53be3 (diff) | |
| parent | 209d599ec5b00c5b92a33e902867fc621e725c93 (diff) | |
| download | nextcloud-server-31e723a907399d7d33a0699da082164055f79b3e.tar.gz nextcloud-server-31e723a907399d7d33a0699da082164055f79b3e.zip | |
Merge github.com:owncloud/core
Conflicts:
lib/public/share.php
Diffstat (limited to 'lib/templatelayout.php')
| -rw-r--r-- | lib/templatelayout.php | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lib/templatelayout.php b/lib/templatelayout.php index 83d36199986..37ece91047f 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -28,11 +28,6 @@ class OC_TemplateLayout extends OC_Template { break; } } - $apps_paths = array(); - foreach(OC_App::getEnabledApps() as $app) { - $apps_paths[$app] = OC_App::getAppWebPath($app); - } - $this->assign( 'apps_paths', str_replace('\\/', '/', json_encode($apps_paths)), false ); // Ugly unescape slashes waiting for better solution } else if ($renderas == 'guest') { parent::__construct('core', 'layout.guest'); } else { |