Changeset 38942

Timestamp:

06/20/11 23:52:40 (2 years ago)

Author:

NeoCat

Message:

Merge remote-tracking branch 'wa-/lockerz'

Files:

• websites/twicli/plugins/thumbnail.js (modified) (1 diff)

websites/twicli/plugins/thumbnail.js

@@ -59 +59 @@
                                         null, 1, 'jsoncallback');
                 }
-                else if (url.match(/^(http:\/\/plixi.com\/p\/\d+)/)) {
+                else if (url.match(/^(http:\/\/lockerz.com\/s\/\d+|http:\/\/plixi.com\/p\/\d+)/)) {
                         addThumbnail(elem, 'http://api.plixi.com/api/TPAPI.svc/imagefromurl?size=thumbnail&url='+url, url);
                 }