diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2013-01-26 13:46:00 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2013-01-26 13:46:00 +0100 |
| commit | 7f0a3018b6a965ce569b8dc3a14aeb0c00c8e06b (patch) | |
| tree | 3d5b0f47841bd22069068128574f4694c8838e60 | |
| parent | 276d98b9ddd18c216956b2c9916583e8098186d0 (diff) | |
| download | nextcloud-server-7f0a3018b6a965ce569b8dc3a14aeb0c00c8e06b.tar.gz nextcloud-server-7f0a3018b6a965ce569b8dc3a14aeb0c00c8e06b.zip | |
Fix undefined variable
| -rw-r--r-- | core/js/config.php | 10 | ||||
| -rw-r--r-- | lib/templatelayout.php | 5 |
2 files changed, 7 insertions, 8 deletions
diff --git a/core/js/config.php b/core/js/config.php index e838fb1cd04..9069175ed6f 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -17,11 +17,15 @@ header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); $l = OC_L10N::get('core'); // Get the config -$debug = (defined('DEBUG') && DEBUG) ? 'true' : 'false'; +$apps_paths = array(); +foreach(OC_App::getEnabledApps() as $app) { + $apps_paths[$app] = OC_App::getAppWebPath($app); +} + $array = array( - "oc_debug" => $debug, + "oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false', "oc_webroot" => "\"".OC::$WEBROOT."\"", - "oc_appswebroots" => "\"".$_['apps_paths']. "\"", + "oc_appswebroots" => str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution "oc_current_user" => "\"".OC_User::getUser(). "\"", "oc_requesttoken" => "\"".OC_Util::callRegister(). "\"", "datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')), 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 { |