Skip to content
Permalink
Browse files

MDL-14072 - Merged from 19_STABLE. Prevent NULLs, empties and numbers…

… to be processed by:

- backup_encode_absolute_links() at backup
- restore_decode_absolute_links() at restore
  • Loading branch information...
stronk7
stronk7 committed Apr 18, 2008
1 parent 5f9e296 commit feb351cfae9284f769419bfba48cd02f77c6ab57
Showing with 16 additions and 5 deletions.
  1. +10 −0 backup/backuplib.php
  2. +6 −5 backup/restorelib.php
@@ -2301,6 +2301,16 @@ function backup_encode_absolute_links($content) {
global $CFG,$preferences;
/// MDL-14072: Prevent NULLs, empties and numbers to be processed by the
/// heavy interlinking. Just a few cpu cycles saved.
if ($content === NULL) {
return NULL;
} else if ($content === '') {
return '';
} else if (is_numeric($content)) {
return $content;
}
//Use one static variable to cache all the require_once calls that,
//under PHP5 seems to increase load too much, and we are requiring
//them here thousands of times (one per content). MDL-8700.
@@ -3495,13 +3495,14 @@ function restore_decode_absolute_links($content) {
global $CFG,$restore;
// MDL-10770
// This function was replacing null with empty string
// Nullity check is added in backup_todb(), this function will no longer not be called from backup_todb() if content is null
// I noticed some parts of the restore code is calling this directly instead of calling backup_todb(), so just in case
// 3rd party mod etc are doing the same
/// MDL-14072: Prevent NULLs, empties and numbers to be processed by the
/// heavy interlinking. Just a few cpu cycles saved.
if ($content === NULL) {
return NULL;
} else if ($content === '') {
return '';
} else if (is_numeric($content)) {
return $content;
}
//Now decode wwwroot and file.php calls

0 comments on commit feb351c

Please sign in to comment.
You can’t perform that action at this time.