Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
d4af4360
Commit
d4af4360
authored
Apr 23, 2015
by
Robert Lyon
Committed by
Gerrit Code Review
Apr 23, 2015
Browse files
Options
Browse Files
Download
Plain Diff
Merge "(Bug785472) Remove unneeded raise_memory_limit calls"
parents
6bc4db12
039564a5
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
0 additions
and
12 deletions
+0
-12
htdocs/admin/groups/uploadcsv.php
htdocs/admin/groups/uploadcsv.php
+0
-1
htdocs/admin/groups/uploadmemberscsv.php
htdocs/admin/groups/uploadmemberscsv.php
+0
-1
htdocs/admin/upgrade.php
htdocs/admin/upgrade.php
+0
-2
htdocs/admin/users/bulkimport.php
htdocs/admin/users/bulkimport.php
+0
-2
htdocs/admin/users/uploadcsv.php
htdocs/admin/users/uploadcsv.php
+0
-1
htdocs/import/index.php
htdocs/import/index.php
+0
-3
htdocs/lib/cron.php
htdocs/lib/cron.php
+0
-1
htdocs/lib/csvfile.php
htdocs/lib/csvfile.php
+0
-1
No files found.
htdocs/admin/groups/uploadcsv.php
View file @
d4af4360
...
...
@@ -18,7 +18,6 @@ require_once('pieforms/pieform.php');
require_once
(
get_config
(
'libroot'
)
.
'group.php'
);
require_once
(
get_config
(
'libroot'
)
.
'institution.php'
);
safe_require
(
'artefact'
,
'internal'
);
raise_memory_limit
(
"512M"
);
// Turn on autodetecting of line endings, so mac newlines (\r) will work
ini_set
(
'auto_detect_line_endings'
,
1
);
...
...
htdocs/admin/groups/uploadmemberscsv.php
View file @
d4af4360
...
...
@@ -18,7 +18,6 @@ require_once('pieforms/pieform.php');
require_once
(
get_config
(
'libroot'
)
.
'group.php'
);
require_once
(
get_config
(
'libroot'
)
.
'institution.php'
);
safe_require
(
'artefact'
,
'internal'
);
raise_memory_limit
(
"512M"
);
// Turn on autodetecting of line endings, so mac newlines (\r) will work
ini_set
(
'auto_detect_line_endings'
,
1
);
...
...
htdocs/admin/upgrade.php
View file @
d4af4360
...
...
@@ -122,8 +122,6 @@ $localsuccess = json_encode(get_string('localdatasuccess', 'admin'));
// Check if Mahara is being installed. An extra hook is required to insert core
// data if so.
if
(
!
empty
(
$upgrades
[
'core'
]
->
install
))
{
raise_time_limit
(
120
);
raise_memory_limit
(
'256M'
);
$upgrades
[
'firstcoredata'
]
=
true
;
$upgrades
[
'localpreinst'
]
=
true
;
$upgrades
[
'lastcoredata'
]
=
true
;
...
...
htdocs/admin/users/bulkimport.php
View file @
d4af4360
...
...
@@ -17,8 +17,6 @@ require_once('institution.php');
require_once
(
get_config
(
'docroot'
)
.
'/lib/htmloutput.php'
);
safe_require
(
'artefact'
,
'internal'
);
safe_require
(
'artefact'
,
'file'
);
raise_memory_limit
(
'1024M'
);
set_time_limit
(
300
);
// 5 minutes
define
(
'TITLE'
,
get_string
(
'bulkleap2aimport'
,
'admin'
));
...
...
htdocs/admin/users/uploadcsv.php
View file @
d4af4360
...
...
@@ -18,7 +18,6 @@ require_once('pieforms/pieform.php');
require_once
(
'institution.php'
);
require_once
(
'phpmailer/class.phpmailer.php'
);
safe_require
(
'artefact'
,
'internal'
);
raise_memory_limit
(
"512M"
);
// Turn on autodetecting of line endings, so mac newlines (\r) will work
ini_set
(
'auto_detect_line_endings'
,
1
);
...
...
htdocs/import/index.php
View file @
d4af4360
...
...
@@ -37,9 +37,6 @@ define('SECTION_PLUGINNAME', 'import');
define
(
'SECTION_PAGE'
,
'index'
);
//TODO: Optimize!
raise_memory_limit
(
"512M"
);
define
(
'PRINTUPLOADFORM_ACT'
,
0
);
define
(
'PRINTIMPORTITEMSFORM_ACT'
,
1
);
define
(
'DOIMPORT_ACT'
,
2
);
...
...
htdocs/lib/cron.php
View file @
d4af4360
...
...
@@ -28,7 +28,6 @@ $fake = isset($argv[1]);
$start
=
$fake
?
strtotime
(
$argv
[
1
])
:
$realstart
;
log_info
(
'---------- cron running '
.
date
(
'r'
,
$start
)
.
' ----------'
);
raise_memory_limit
(
'128M'
);
if
(
!
is_writable
(
get_config
(
'dataroot'
)))
{
log_warn
(
"Unable to write to dataroot directory."
);
...
...
htdocs/lib/csvfile.php
View file @
d4af4360
...
...
@@ -10,7 +10,6 @@
*/
defined
(
'INTERNAL'
)
||
die
();
raise_memory_limit
(
"512M"
);
define
(
'MAX_LINE_LENGTH'
,
1024
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment