/[drupal]/contributions/modules/flashvideo/flashvideo.module
ViewVC logotype

Diff of /contributions/modules/flashvideo/flashvideo.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.73.2.86, Thu Mar 19 03:13:18 2009 UTC revision 1.73.2.87, Wed Apr 1 00:16:21 2009 UTC
# Line 2015  function flashvideo_get_video_object($no Line 2015  function flashvideo_get_video_object($no
2015        $video_file = db_fetch_object(db_query($sql, FLASHVIDEO_STATUS_CONVERTED, $nid, $index));        $video_file = db_fetch_object(db_query($sql, FLASHVIDEO_STATUS_CONVERTED, $nid, $index));
2016      }      }
2017      else { // They're using the core Upload module.      else { // They're using the core Upload module.
2018        $vid_query = $node->vid ? "(u.vid = %d)" : "(u.vid <> %d)";        $vid_query = $node->vid ? " AND (u.vid = %d)" : " AND (u.vid <> %d)";
2019          if ($nid != $node->nid) { // They're referencing a video from another node.
2020            $vid_query = '';
2021          }
2022        $sql = "SELECT fv.oid, f.filepath, fv.width, fv.height, f.fid FROM {flashvideo} fv        $sql = "SELECT fv.oid, f.filepath, fv.width, fv.height, f.fid FROM {flashvideo} fv
2023               LEFT JOIN {files} f ON f.fid = fv.fid               LEFT JOIN {files} f ON f.fid = fv.fid
2024               LEFT JOIN {upload} u on u.fid = fv.fid               LEFT JOIN {upload} u on u.fid = fv.fid
2025               WHERE $flashmime AND (fv.status = %d) AND (fv.nid = %d) AND (fv.video_index = %d) AND $vid_query";               WHERE $flashmime AND (fv.status = %d) AND (fv.nid = %d) AND (fv.video_index = %d)$vid_query";
2026        $video_file = db_fetch_object(db_query($sql, FLASHVIDEO_STATUS_CONVERTED, $nid, $index, $node->vid));        $video_file = db_fetch_object(db_query($sql, FLASHVIDEO_STATUS_CONVERTED, $nid, $index, $node->vid));
2027      }      }
2028    }    }
# Line 2029  function flashvideo_get_video_object($no Line 2032  function flashvideo_get_video_object($no
2032      $sql = "SELECT f.filepath FROM {flashvideo} fv LEFT JOIN {files} f ON f.fid = fv.fid WHERE (f.fid = %d)";      $sql = "SELECT f.filepath FROM {flashvideo} fv LEFT JOIN {files} f ON f.fid = fv.fid WHERE (f.fid = %d)";
2033      $video['original_video'] = db_result(db_query($sql, $video_file->oid));      $video['original_video'] = db_result(db_query($sql, $video_file->oid));
2034    }    }
   
2035    // If no video file was defined...    // If no video file was defined...
2036    if (!isset($video['file'])) {    if (!isset($video['file'])) {
2037      // Do we need to use the playlist?      // Do we need to use the playlist?
Legend:
Removed from v.1.73.2.86  
changed lines
  Added in v.1.73.2.87
  ViewVC Help
Powered by ViewVC 1.1.2