diff options
author | root <root@migration.vz.lan> | 2012-10-12 17:02:09 +0000 |
---|---|---|
committer | root <root@migration.vz.lan> | 2012-10-12 17:02:09 +0000 |
commit | df98993b828ad4b12f64c54824e439804bc4af5c (patch) | |
tree | a7e9151b0203ae88662b229b29565c73086d34ec /views/default | |
parent | cd216f6feae68146c8997a17c9fa37b674357b63 (diff) | |
parent | c02bb30c3539587511bd866efbb00ce33b0ba853 (diff) | |
download | elgg-df98993b828ad4b12f64c54824e439804bc4af5c.tar.gz elgg-df98993b828ad4b12f64c54824e439804bc4af5c.tar.bz2 |
Merge branch 'master' of git://gitorious.org/lorea/videolist
Diffstat (limited to 'views/default')
-rw-r--r-- | views/default/object/videolist_item.php | 2 | ||||
-rw-r--r-- | views/default/videolist/watch.php | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/views/default/object/videolist_item.php b/views/default/object/videolist_item.php index a1943216d..474394288 100644 --- a/views/default/object/videolist_item.php +++ b/views/default/object/videolist_item.php @@ -62,7 +62,7 @@ if (elgg_in_context('widgets')) { if ($full && !elgg_in_context('gallery')) { $dimensions = elgg_get_config('videolist_dimensions'); - $content = elgg_view("videolist/watch/{$entity->videotype}", array( + $content = elgg_view("videolist/watch", array( 'entity' => $entity, 'width' => (int) $dimensions['width'], 'height' => (int) $dimensions['height'], diff --git a/views/default/videolist/watch.php b/views/default/videolist/watch.php new file mode 100644 index 000000000..2e1dbacec --- /dev/null +++ b/views/default/videolist/watch.php @@ -0,0 +1,8 @@ +<?php + +$entity = elgg_extract('entity', $vars); +if (elgg_view_exists("videolist/watch/$entity->videotype")) { + echo elgg_view("videolist/watch/$entity->videotype", $vars); +} else { + echo elgg_view("videolist/watch/default", $vars); +} |