Remove deprecated methods from IUserAvatar interface

diff --git a/wcfsetup/install/files/lib/data/user/avatar/DefaultAvatar.class.php b/wcfsetup/install/files/lib/data/user/avatar/DefaultAvatar.class.php
index bdd819ca14c0ff079b4338d251ced509d6917d2d..d69b8c9fd082a5ce9d2650e8bdfc91ba3044a672 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/avatar/DefaultAvatar.class.php
+++ b/wcfsetup/install/files/lib/data/user/avatar/DefaultAvatar.class.php
@@ -105,7 +105,7 @@ SVG;
     }
 
     /**
-     * @inheritDoc
+     * @deprecated  3.0
      */
     public function canCrop()
     {
@@ -113,7 +113,7 @@ SVG;
     }
 
     /**
-     * @inheritDoc
+     * @deprecated  3.0
      */
     public function getCropImageTag($size = null)
     {

diff --git a/wcfsetup/install/files/lib/data/user/avatar/IUserAvatar.class.php b/wcfsetup/install/files/lib/data/user/avatar/IUserAvatar.class.php
index 2cb2cd24a17c8330f555e0b08d6eee4737ee9a4d..b9c34918b2e874427f3f2bb0927e403f85620737 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/avatar/IUserAvatar.class.php
+++ b/wcfsetup/install/files/lib/data/user/avatar/IUserAvatar.class.php
@@ -12,14 +12,6 @@ namespace wcf\data\user\avatar;
  */
 interface IUserAvatar
 {
-    /**
-     * Returns true if this avatar can be cropped.
-     *
-     * @return  bool
-     * @deprecated  3.0
-     */
-    public function canCrop();
-
     /**
      * Returns the url to this avatar.
      *
@@ -36,15 +28,6 @@ interface IUserAvatar
      */
     public function getImageTag($size = null);
 
-    /**
-     * Returns the image tag used for cropping.
-     *
-     * @param int $size
-     * @return  string
-     * @deprecated  3.0
-     */
-    public function getCropImageTag($size = null);
-
     /**
      * Returns the width of this avatar.
      *

diff --git a/wcfsetup/install/files/lib/data/user/avatar/UserAvatar.class.php b/wcfsetup/install/files/lib/data/user/avatar/UserAvatar.class.php
index 225d724e16866e9bd47ea22fac65352f2a7fcca0..0ff38f04dd41dbfda83a3d804758fa11a9b78fd0 100644 (file)
--- a/wcfsetup/install/files/lib/data/user/avatar/UserAvatar.class.php
+++ b/wcfsetup/install/files/lib/data/user/avatar/UserAvatar.class.php
@@ -113,29 +113,29 @@ class UserAvatar extends DatabaseObject implements IUserAvatar
     /**
      * @inheritDoc
      */
-    public function getCropImageTag($size = null)
+    public function getWidth()
     {
-        return '';
+        return $this->width;
     }
 
     /**
      * @inheritDoc
      */
-    public function getWidth()
+    public function getHeight()
     {
-        return $this->width;
+        return $this->height;
     }
 
     /**
-     * @inheritDoc
+     * @deprecated  3.0
      */
-    public function getHeight()
+    public function getCropImageTag($size = null)
     {
-        return $this->height;
+        return '';
     }
 
     /**
-     * @inheritDoc
+     * @deprecated  3.0
      */
     public function canCrop()
     {