Index: update/common/scripts/updatexmltext.php
===================================================================
--- update/common/scripts/updatexmltext.php	(revision 20745)
+++ update/common/scripts/updatexmltext.php	(working copy)
@@ -155,13 +155,15 @@
             $targetAttribute = null;
             for ( $j = 0; $j < count( $linkAttributes ); ++$j )
             {
-                $linkAttribute =& $linkAttributes[$j];
-                if ( $linkAttribute->name() == 'href' )
-                    $hrefAttribute =& $linkAttributes[$j];
-                else if ( $linkAttribute->name() == 'id' )
-                    $idAttribute =& $linkAttributes[$j];
-                else if ( $linkAttribute->name() == 'target' )
-                    $targetAttribute =& $linkAttributes[$j];
+                if ( $linkAttribute =& $linkAttributes[$j] )
+                {
+                    if ( $linkAttribute->name() == 'href' )
+                        $hrefAttribute =& $linkAttributes[$j];
+                    else if ( $linkAttribute->name() == 'url_id' )
+                        $idAttribute =& $linkAttributes[$j];
+                    else if ( $linkAttribute->name() == 'target' )
+                        $targetAttribute =& $linkAttributes[$j];
+                }
             }
             if ( $idAttribute === null and
                  $hrefAttribute !== null )
@@ -182,7 +184,7 @@
                     $urlRefMap[$href] =& $url;
                     $urlIDMap[$urlID] =& $url;
                 }
-                $idAttribute = $doc->createAttributeNode( 'id', $url->attribute( 'id' ) );
+                $idAttribute = $doc->createAttributeNode( 'url_id', $url->attribute( 'id' ) );
                 $child->appendAttribute( $idAttribute );
                 $child->removeNamedAttribute( 'href' );
                 $foundLinks = true;