Index: /bbcode.deviantart/bbcodes.xml
===================================================================
--- /bbcode.deviantart/bbcodes.xml (revision 55)
+++ /bbcode.deviantart/bbcodes.xml (revision 139)
@@ -6,4 +6,10 @@
 			<classname>DeviantArtBBCode</classname>
 			<allowedchildren>none</allowedchildren>
+			<attributes>
+				<attribute name="0">
+					<required>0</required>
+					<validationpattern>\d+x\d+</validationpattern>
+				</attribute>
+			</attributes>
 			<sourcecode>1</sourcecode>
 			<wysiwygicon>deviantartM.png</wysiwygicon>
Index: /bbcode.deviantart/files/lib/data/message/bbcode/DeviantArtBBCode.class.php
===================================================================
--- /bbcode.deviantart/files/lib/data/message/bbcode/DeviantArtBBCode.class.php (revision 78)
+++ /bbcode.deviantart/files/lib/data/message/bbcode/DeviantArtBBCode.class.php (revision 139)
@@ -22,9 +22,8 @@
 		// id as input
 			$id = intval($content);
-		} else if(strpos($content, 'http://') == 0){
+		} else if(strpos($content, 'http://') == 0 && preg_match('/-(\d+)$/', $content, $hits)){
 		// url as input
-			preg_match('/-(\d+)$/', $content, $hits);
 			$id = intval($hits[1]);
-		} else if(strpos($content, '<object') == 0){
+		} else if(strpos($content, '<object') !== false){
 		// html as input
 			preg_match('/^<object width\="(\d+)" height\="(\d+)">.+value\="id\=(\d+)"/', $content, $hits);
@@ -35,4 +34,9 @@
 		} else {
 			return;
+		}
+		
+		// overwrite width/height from attribute
+		if(isset($openingTag['attributes'][0])) {
+			list($width,$height) = explode("x", $openingTag['attributes'][0]);
 		}
 		
Index: /bbcode.deviantart/package.xml
===================================================================
--- /bbcode.deviantart/package.xml (revision 119)
+++ /bbcode.deviantart/package.xml (revision 139)
@@ -5,5 +5,5 @@
 		<packagename>deviantART BBCode</packagename>
 		<packageDescription><![CDATA[BBCode for deviantART Query]]></packageDescription>
-		<version>1.0.1</version>
+		<version>1.1.0</version>
 		<date>DATE</date>
 		<plugin>com.woltlab.wcf.data.message.bbcode</plugin>
@@ -29,6 +29,12 @@
 	</instructions>
 	
+	<instructions type="update" fromversion="1.0.1">
+		<files>files.tar</files>
+		<bbcodes>bbcodes.xml</bbcodes>
+	</instructions>
+	
 	<instructions type="update" fromversion="1.0.0">
 		<files>files.tar</files>
+		<bbcodes>bbcodes.xml</bbcodes>
 	</instructions>
 </package>