diff --git a/kernel/classes/ezcontentclass.php b/kernel/classes/ezcontentclass.php
index <HASH>..<HASH> 100644
--- a/kernel/classes/ezcontentclass.php
+++ b/kernel/classes/ezcontentclass.php
@@ -121,7 +121,7 @@ class eZContentClass extends eZPersistentObject
                                                       'object_count' => 'objectCount',
                                                       'version_count' => 'versionCount',
                                                       'version_status' => 'versionStatus',
-                                                      'remote_id' => 'remoteID',
+                                                      'remote_id' => 'remoteID', // Note: This overrides remote_id field
                                                       'ingroup_list' => 'fetchGroupList',
                                                       'ingroup_id_list' => 'fetchGroupIDList',
                                                       'match_ingroup_id_list' => 'fetchMatchGroupIDList',
@@ -367,23 +367,6 @@ class eZContentClass extends eZPersistentObject
         return $classList;
     }
 
-    function attribute( $attr )
-    {
-        switch( $attr )
-        {
-            case 'remote_id':
-            {
-                return $this->remoteID();
-            } break;
-
-            default:
-            {
-                return eZPersistentObject::attribute( $attr );
-            } break;
-        }
-        return null;
-    }
-
     /*!
      \return The creator of the class as an eZUser object by using the $CreatorID as user ID.
     */
- Removed code for remote_id attribute in attribute(), it is now handled
  by eZPersistentObject which will check function_attributes before fields.


git-svn-id: file:///home/patrick.allaert/svn-git/ezp-repo/ezpublish/trunk@<I> a<I>eee8c-daba-<I>-acae-fa<I>f<I>