mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git.kde.org:owncloud

This commit is contained in:
Côme BERNIGAUD 2011-08-27 18:11:32 +02:00
parent 0e8d3251f5 f8fc8eb430
commit 52ca447efc
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/media/js/player.js
View File

@ -142,7 +142,6 @@ var PlayList={
PlayList.items.push(item);
},
remove:function(index){
alert('remove');
PlayList.items.splice(index,1);
PlayList.render();
},

12
lib/setup.php
View File

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