diff --git a/src/_h5ai/client/js/inc/core/location.js b/src/_h5ai/client/js/inc/core/location.js index 7b3f2be6..0a62f8c7 100644 --- a/src/_h5ai/client/js/inc/core/location.js +++ b/src/_h5ai/client/js/inc/core/location.js @@ -121,13 +121,13 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event } var item = getItem(); - if (item.isLocationLoaded) { + if (item.isLoaded) { event.pub('location.changed', item); refresh(); } else { notify.set('loading...'); load(function () { - item.isLocationLoaded = true; + item.isLoaded = true; notify.set(); event.pub('location.changed', item); }); @@ -136,7 +136,6 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event refresh = function () { - var item = getItem(), oldItems = _.values(item.content); diff --git a/src/_h5ai/server/php/index.php b/src/_h5ai/server/php/index.php index aca10b8f..1f3f54b2 100644 --- a/src/_h5ai/server/php/index.php +++ b/src/_h5ai/server/php/index.php @@ -7,7 +7,8 @@ function normalize_path($path, $trailing_slash = false) { } define("APP_ABS_PATH", normalize_path(dirname(dirname(dirname(__FILE__))))); -define("APP_ABS_HREF", normalize_path(dirname(dirname(dirname(getenv("SCRIPT_NAME")))), true)); +// define("APP_ABS_HREF", normalize_path(dirname(dirname(dirname(getenv("SCRIPT_NAME")))), true)); +define("APP_ABS_HREF", normalize_path(dirname(dirname(dirname(preg_replace('#^.*//#', '/', getenv("SCRIPT_NAME"))))), true)); // fixes lighttpd issues define("ABS_HREF", normalize_path(preg_replace('/[^\\/]*$/', '', getenv("REQUEST_URI")), true)); function normalized_require_once($lib) {