replacing _NULL_ with $@NULL@$ during backup/restore

diff --git a/backup/backuplib.php b/backup/backuplib.php
index 5b892f192db2973d29b4aa382ad62a0c3143396d..7f77ac4c7eb8e745a5cf60f7fbb9d7f1d08db27f 100644 (file)
--- a/backup/backuplib.php
+++ b/backup/backuplib.php
@@ -446,7 +446,7 @@
         //Here we encode absolute links
         // MDL-10770
         if (is_null($content)) {
-            $content = '_NULL_'; 
+            $content = '$@NULL@$'; 
         } else {
             $content = backup_encode_absolute_links($content);
         }

diff --git a/backup/lib.php b/backup/lib.php
index 52b087538194f4128dd33398503f7b7ceae26c1b..113201e34162016804d7bf2265b9adaee8f4cb67 100644 (file)
--- a/backup/lib.php
+++ b/backup/lib.php
@@ -539,7 +539,7 @@
     //It's used intensivelly when restoring modules and saving them in db
     function backup_todb ($data) {
         // MDL-10770
-        if ($data === '_NULL_') {
+        if ($data === '$@NULL@$') {
             return null; 
         } else {
             return restore_decode_absolute_links(addslashes($data));