[linterna-magica-commit] [124] Merging r123 from trunk.

[Ivaylo Valkov]

Revision: 124
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=124
Author:   valkov
Date:     2011-07-12 08:42:05 +0000 (Tue, 12 Jul 2011)
Log Message:
-----------
Merging r123 from trunk.

Revision Links:
--------------
    http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=123

Modified Paths:
--------------
    branches/task-11216/src/lm_extract_video_link.js

Property Changed:
----------------
    branches/task-11216/


Property changes on: branches/task-11216
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.0.9:94
/trunk:103,106-107,113,115
   + /branches/0.0.9:94
/trunk:103,106-107,113,115,123

Modified: branches/task-11216/src/lm_extract_video_link.js
===================================================================
--- branches/task-11216/src/lm_extract_video_link.js    2011-07-12 08:40:19 UTC 
(rev 123)
+++ branches/task-11216/src/lm_extract_video_link.js    2011-07-12 08:42:05 UTC 
(rev 124)
@@ -80,7 +80,7 @@
        // is not accessible.
        link_re = new RegExp (
            "\\\{{0}.*(video|flv_ur|streamer|file|moviepath|videourl|"+
-               "mediaurl|sdurl|videopath|flv|url|ms|nextmovie)"+
+               "mediaurl|sdurl|videopath|flv|url|ms|nextmovie|flvaddress)"+
                "(\\\"|\\\')*\\\s*(\\\=|\\\:|\\\,)\\\s*(\\\"|\\\')*"+
                (/clipovete\.com/i.test(window.location.hostname)
                 ? "(.*)\\\&(video_id)=(.*)" :