diff --git a/backup/backuplib.php b/backup/backuplib.php index 6923292af01..91e833e6184 100644 --- a/backup/backuplib.php +++ b/backup/backuplib.php @@ -2301,6 +2301,16 @@ 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. diff --git a/backup/restorelib.php b/backup/restorelib.php index 70207df345e..ff91e58b3dd 100644 --- a/backup/restorelib.php +++ b/backup/restorelib.php @@ -3495,13 +3495,14 @@ define('RESTORE_GROUPS_GROUPINGS', 3); 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