Changeset 4535

Timestamp:

02/02/12 10:12:58 (4 months ago)

Author:

tboutell

Message:

Hit #1219 viddler broke when they switched abruptly to clean URLs with video IDs in them. This is better in the long run (no API call just to figure out what the video ID is from the URL, no need to cache the result of that call) but it broke a lot of stuff

Files:

• plugins/apostrophePlugin/branches/1.5/lib/embedService/aViddler.class.php (modified) (2 diffs)

plugins/apostrophePlugin/branches/1.5/lib/embedService/aViddler.class.php

@@ -162 +162 @@
     $info['credit'] = (string) $result['author'];
     $tags = array();
-    foreach ($result['tags'] as $tag)
-    {
-      if ($tag['type'] === 'global')
+    if (isset($result['tags']))
+    {
+      foreach ($result['tags'] as $tag)
       {
-        $tags[] = $tag['text'];
+        if ($tag['type'] === 'global')
+        {
+          $tags[] = $tag['text'];
+        }
       }
     }
@@ -205 +208 @@
   public function getIdFromUrl($url)
   {
-    // Viddler is atypical in that you cannot determine the id from the URL,
+    // Newfangled viddler URLs have ids in them
+    if (preg_match("/viddler.com\/v\/(\w+)$/", $url, $matches))
+    {
+      $id = $matches[1];
+      return $id;
+    }
+    
+    // OLD STYLE: Viddler is atypical in that you cannot determine the id from the URL,
     // so let's ask them
     if (preg_match("/viddler.com\/explore\//", $url))