summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/css/fixes.css1
-rw-r--r--core/user/controller.php2
-rw-r--r--version.php4
3 files changed, 4 insertions, 3 deletions
diff --git a/core/css/fixes.css b/core/css/fixes.css
index f1dc016cad2..79666494584 100644
--- a/core/css/fixes.css
+++ b/core/css/fixes.css
@@ -62,6 +62,7 @@ select {
/* fix installation screen rendering issue for IE8+9 */
.lte9 #body-login {
+ min-height: 100%;
height: auto !important;
}
diff --git a/core/user/controller.php b/core/user/controller.php
index cbcbd936183..ea926f6ad93 100644
--- a/core/user/controller.php
+++ b/core/user/controller.php
@@ -22,7 +22,7 @@ class Controller {
if (is_object($userObject)) {
$result[$user] = $userObject->getDisplayName();
} else {
- $result[$user] = false;
+ $result[$user] = $user;
}
}
diff --git a/version.php b/version.php
index 2c26d9034b4..2a21e9ab9ef 100644
--- a/version.php
+++ b/version.php
@@ -3,10 +3,10 @@
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number.
-$OC_Version=array(7, 0, 6, 1);
+$OC_Version=array(7, 0, 6, 2);
// The human readable string
-$OC_VersionString='7.0.6 RC2';
+$OC_VersionString='7.0.6';
// The ownCloud edition
$OC_Edition='';