diff options
| author | Côme BERNIGAUD <come.bernigaud@laposte.net> | 2011-08-27 18:11:32 +0200 |
|---|---|---|
| committer | Côme BERNIGAUD <come.bernigaud@laposte.net> | 2011-08-27 18:11:32 +0200 |
| commit | 52ca447efc022c48b257064fe446be307169adf0 (patch) | |
| tree | 57ed9676a7784f1a7524ec0d3010ca30c7111a30 | |
| parent | 0e8d3251f5bf75ef919789d55613996d458edbb2 (diff) | |
| parent | f8fc8eb430f653ae0c64dd2787373fba426e074e (diff) | |
| download | nextcloud-server-52ca447efc022c48b257064fe446be307169adf0.tar.gz nextcloud-server-52ca447efc022c48b257064fe446be307169adf0.zip | |
Merge branch 'master' of git.kde.org:owncloud
| -rw-r--r-- | apps/media/js/player.js | 1 | ||||
| -rw-r--r-- | lib/setup.php | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/apps/media/js/player.js b/apps/media/js/player.js index 7581c27393f..f696b87bbde 100644 --- a/apps/media/js/player.js +++ b/apps/media/js/player.js @@ -142,7 +142,6 @@ var PlayList={ PlayList.items.push(item); }, remove:function(index){ - alert('remove'); PlayList.items.splice(index,1); PlayList.render(); }, diff --git a/lib/setup.php b/lib/setup.php index 9f31b47c0e5..afe56126277 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -275,12 +275,12 @@ class OC_Setup { private static function createHtaccess() { $SERVERROOT=OC::$SERVERROOT; $WEBROOT=OC::$WEBROOT; - $content = "ErrorDocument 404 /$WEBROOT/core/templates/404.php\n";//custom 404 error page - $content.= '<IfModule mod_php5.c>'; - $content.= 'php_value upload_max_filesize 512M';//upload limit - $content.= 'php_value post_max_size 512M'; - $content.= 'SetEnv htaccessWorking true'; - $content.= '</IfModule>'; + $content = "ErrorDocument 404 $WEBROOT/core/templates/404.php\n";//custom 404 error page + $content.= "<IfModule mod_php5.c>\n"; + $content.= "php_value upload_max_filesize 512M\n";//upload limit + $content.= "php_value post_max_size 512M\n"; + $content.= "SetEnv htaccessWorking true\n"; + $content.= "</IfModule>\n"; $content.= "Options -Indexes\n"; @file_put_contents($SERVERROOT.'/.htaccess', $content); //supress errors in case we don't have permissions for it |