diff options
| author | Scott Barnett <scott.n.barnett@gmail.com> | 2011-09-27 05:49:49 +1000 |
|---|---|---|
| committer | Scott Barnett <scott.n.barnett@gmail.com> | 2011-09-27 05:49:49 +1000 |
| commit | 861ef363a5fa04d8eea71689aeba8117958252dd (patch) | |
| tree | e8691d55e95877edb88d3460e3c1fb28fae5a34d | |
| parent | f4ecf47e619c7b182e08f23c6474717ac5df99fe (diff) | |
| parent | 3fcc7b5949fcf9c9220ff8f2a5e5e1f22885465f (diff) | |
| download | nextcloud-server-861ef363a5fa04d8eea71689aeba8117958252dd.tar.gz nextcloud-server-861ef363a5fa04d8eea71689aeba8117958252dd.zip | |
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
| -rw-r--r-- | core/js/js.js | 8 | ||||
| -rw-r--r-- | lib/preferences.php | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/js/js.js b/core/js/js.js index 9d2b20d10f0..a75e1d41f60 100644 --- a/core/js/js.js +++ b/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); } diff --git a/lib/preferences.php b/lib/preferences.php index b4bd6777f9e..6d8aa17afd5 100644 --- a/lib/preferences.php +++ b/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 ){ |