summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-03-21 12:16:51 +0100
committerVincent Petry <pvince81@owncloud.com>2014-03-21 12:16:51 +0100
commita52bc333a265444d3a038f08bb70231127b2c9bf (patch)
treed63f8656f3a93072be607d6489501d61fdde47ba /lib
parent3f95f9325fafc04026c697b1a4bfb471dc5e19d8 (diff)
parent239069c8386a1a4ec29594d392e8359b8914af47 (diff)
downloadnextcloud-server-a52bc333a265444d3a038f08bb70231127b2c9bf.tar.gz
nextcloud-server-a52bc333a265444d3a038f08bb70231127b2c9bf.zip
Merge pull request #7611 from owncloud/fix-updater
Use $installedVersion instead of $currentVersion
Diffstat (limited to 'lib')
-rw-r--r--lib/private/updater.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 18864c17ec9..9f57aa0b6a0 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -110,7 +110,7 @@ class Updater extends BasicEmitter {
/*
* START CONFIG CHANGES FOR OLDER VERSIONS
*/
- if (!\OC::$CLI && version_compare($currentVersion, '6.90.1', '<')) {
+ if (!\OC::$CLI && version_compare($installedVersion, '6.90.1', '<')) {
// Add the overwriteHost config if it is not existant
// This is added to prevent host header poisoning
\OC_Config::setValue('trusted_domains', \OC_Config::getValue('trusted_domains', array(\OC_Request::serverHost())));
n>}); this.maxZ = maxZ; }, height: function() { // handle IE 6 if ($.browser.msie && $.browser.version < 7) { var scrollHeight = Math.max( document.documentElement.scrollHeight, document.body.scrollHeight ); var offsetHeight = Math.max( document.documentElement.offsetHeight, document.body.offsetHeight ); if (scrollHeight < offsetHeight) { return $(window).height() + 'px'; } else { return scrollHeight + 'px'; } // handle "good" browsers } else { return $(document).height() + 'px'; } }, width: function() { // handle IE 6 if ($.browser.msie && $.browser.version < 7) { var scrollWidth = Math.max( document.documentElement.scrollWidth, document.body.scrollWidth ); var offsetWidth = Math.max( document.documentElement.offsetWidth, document.body.offsetWidth ); if (scrollWidth < offsetWidth) { return $(window).width() + 'px'; } else { return scrollWidth + 'px'; } // handle "good" browsers } else { return $(document).width() + 'px'; } }, resize: function() { /* If the dialog is draggable and the user drags it past the * right edge of the window, the document becomes wider so we * need to stretch the overlay. If the user then drags the * dialog back to the left, the document will become narrower, * so we need to shrink the overlay to the appropriate size. * This is handled by shrinking the overlay before setting it * to the full document size. */ var $overlays = $([]); $.each($.ui.dialog.overlay.instances, function() { $overlays = $overlays.add(this); }); $overlays.css({ width: 0, height: 0 }).css({ width: $.ui.dialog.overlay.width(), height: $.ui.dialog.overlay.height() }); } }); $.extend($.ui.dialog.overlay.prototype, { destroy: function() { $.ui.dialog.overlay.destroy(this.$el); } }); })(jQuery);