mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
nthaler: Bugfix: Removed "unchecked" set_time_limit call.
(merged from branches/gsoc) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42091 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
4f87512d73
commit
3cacc11986
@ -123,7 +123,7 @@ class DatabaseAdmin extends Controller {
|
||||
*/
|
||||
function doBuild($quiet = false, $populate = true) {
|
||||
$conn = DB::getConn();
|
||||
|
||||
|
||||
if($quiet) {
|
||||
DB::quiet();
|
||||
} else {
|
||||
@ -170,7 +170,7 @@ class DatabaseAdmin extends Controller {
|
||||
$conn->endSchemaUpdate();
|
||||
|
||||
ManifestBuilder::update_db_tables();
|
||||
|
||||
|
||||
if($populate) {
|
||||
if(!$quiet) {
|
||||
echo '<p><b>Creating database records</b></p>';
|
||||
@ -189,7 +189,8 @@ class DatabaseAdmin extends Controller {
|
||||
}
|
||||
}
|
||||
|
||||
touch(TEMP_FOLDER . '/database-last-generated-' .str_replace(array('\\','/',':'),'.', Director::baseFolder()));
|
||||
touch(TEMP_FOLDER . '/database-last-generated-' .
|
||||
str_replace(array('\\', '/', ':'), '.', Director::baseFolder()));
|
||||
|
||||
if(isset($_REQUEST['from_installer'])) {
|
||||
echo "OK";
|
||||
|
Loading…
x
Reference in New Issue
Block a user