Merge branch 'master' of git://gitorious.org/owncloud/owncloud

core/js/js.js

@@ -83,8 +83,8 @@ OC={
 	 */
 	addScript:function(app,script,ready){
 		var path=OC.filePath(app,'js',script+'.js');
-		if(OC.addStyle.loaded.indexOf(path)==-1){
-			OC.addStyle.loaded.push(path);
+		if(OC.addScript.loaded.indexOf(path)==-1){
+			OC.addScript.loaded.push(path);
 			if(ready){
 				$.getScript(path,ready);
 			}else{
@@ -103,8 +103,8 @@ OC={
 	 */
 	addStyle:function(app,style){
 		var path=OC.filePath(app,'css',style+'.css');
-		if(OC.addScript.loaded.indexOf(path)==-1){
-			OC.addScript.loaded.push(path);
+		if(OC.addStyle.loaded.indexOf(path)==-1){
+			OC.addStyle.loaded.push(path);
 			var style=$('<link rel="stylesheet" type="text/css" href="'+path+'"/>');
 			$('head').append(style);
 		}

lib/preferences.php

@@ -63,7 +63,7 @@ class OC_Preferences{
 	 * @param $user user
 	 * @returns array with app ids
 	 *
-	 * This function returns a list of all apps of the userthat have at least
+	 * This function returns a list of all apps of the user that have at least
 	 * one entry in the preferences table.
 	 */
 	public static function getApps( $user ){