wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Scott Barnett 2011-09-27 05:49:49 +10:00
commit 861ef363a5
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/js/js.js
View file

@ -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);
}

2
lib/preferences.php
View file

@ -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 ){