Merge branch 'master' into ocs_api

4 files changed, 13 insertions, 8 deletions

diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index 7a9ee26b477..5c68174fa07 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -21,5 +21,7 @@
 "last month" => "Sidste måned",
 "months ago" => "måneder siden",
 "last year" => "Sidste år",
-"years ago" => "år siden"
+"years ago" => "år siden",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s er tilgængelig. Få <a href=\"%s\">mere information</a>",
+"up to date" => "opdateret"
 );
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index 273773f2f7b..eac839e78f3 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -12,16 +12,16 @@
 "Application is not enabled" => "Aplikacija ni omogočena",
 "Authentication error" => "Napaka overitve",
 "Token expired. Please reload page." => "Žeton je potekel. Prosimo, če spletno stran znova naložite.",
-"seconds ago" => "sekund nazaj",
+"seconds ago" => "pred nekaj sekundami",
 "1 minute ago" => "pred minuto",
 "%d minutes ago" => "pred %d minutami",
 "today" => "danes",
 "yesterday" => "včeraj",
 "%d days ago" => "pred %d dnevi",
 "last month" => "prejšnji mesec",
-"months ago" => "mesecev nazaj",
+"months ago" => "pred nekaj meseci",
 "last year" => "lani",
-"years ago" => "let nazaj",
+"years ago" => "pred nekaj leti",
 "%s is available. Get <a href=\"%s\">more information</a>" => "%s je na voljo. <a href=\"%s\">Več informacij.</a>",
 "up to date" => "ažuren",
 "updates check is disabled" => "preverjanje za posodobitve je onemogočeno"
diff --git a/lib/util.php b/lib/util.php
index b66d5426a6e..5e39fd1f914 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -211,13 +211,13 @@ class OC_Util {
 		$permissionsHint="Permissions can usually be fixed by giving the webserver write access to the ownCloud directory";
 
 		// Check if config folder is writable.
-		if(!is_writable(OC::$SERVERROOT."/config/")) {
+		if(!is_writable(OC::$SERVERROOT."/config/") or !is_readable(OC::$SERVERROOT."/config/")) {
 			$errors[]=array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud");
 		}
 
 		// Check if there is a writable install folder.
 		if(OC_Config::getValue('appstoreenabled', true)) {
-			if( OC_App::getInstallPath() === null  || !is_writable(OC_App::getInstallPath())) {
+			if( OC_App::getInstallPath() === null  || !is_writable(OC_App::getInstallPath()) || !is_readable(OC_App::getInstallPath()) ) {
 				$errors[]=array('error'=>"Can't write into apps directory",'hint'=>"You can usually fix this by giving the webserver user write access to the apps directory
 				in owncloud or disabling the appstore in the config file.");
 			}
@@ -257,7 +257,7 @@ class OC_Util {
 			if(!$success) {
 				$errors[]=array('error'=>"Can't create data directory (".$CONFIG_DATADIRECTORY.")",'hint'=>"You can usually fix this by giving the webserver write access to the ownCloud directory '".OC::$SERVERROOT."' (in a terminal, use the command 'chown -R www-data:www-data /path/to/your/owncloud/install/data' ");
 			}
-		} else if(!is_writable($CONFIG_DATADIRECTORY)) {
+		} else if(!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) {
 			$errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud<br/>','hint'=>$permissionsHint);
 		}
 
diff --git a/lib/vcategories.php b/lib/vcategories.php
index f5123adeeb6..6b1d6a316f1 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -55,7 +55,10 @@ class OC_VCategories {
 		$this->app = $app;
 		$this->user = is_null($user) ? OC_User::getUser() : $user;
 		$categories = trim(OC_Preferences::getValue($this->user, $app, self::PREF_CATEGORIES_LABEL, ''));
-		$this->categories = $categories != '' ? @unserialize($categories) : $defcategories;
+		if ($categories) {
+			$categories = @unserialize($categories);
+		}
+		$this->categories = is_array($categories) ? $categories : $defcategories;
 	}
 
 	/**