fix bugs from merging atutor changes.

[acontent.git] / docs / home / classes / ContentUtility.class.php

diff --git a/docs/home/classes/ContentUtility.class.php b/docs/home/classes/ContentUtility.class.php
index f90f236..72bff9c 100644 (file)
--- a/docs/home/classes/ContentUtility.class.php
+++ b/docs/home/classes/ContentUtility.class.php
@@ -212,7 +212,7 @@ class ContentUtility {
                                        clip: { autoPlay: false },              \r
                                plugins:  { \r
                                        controls: { \r
-                                           all: false,  \r
+                                           buttons:true, \r
                                            play: true,  \r
                                            scrubber: true \r
                                        }         \r
@@ -233,7 +233,7 @@ class ContentUtility {
      *          For instance: http://www.youtube.com/watch?v=a0ryB0m0MiM\r
      *          Otherwise, return the original send-in parameter.\r
      */\r
-    function convertYoutubePlayURLToWatchURL($youtube_playURL) {\r
+    public function convertYoutubePlayURLToWatchURL($youtube_playURL) {\r
         return preg_replace("/(http:\/\/[a-z0-9\.]*)?youtube.com\/v\/(.*)/",\r
                             "\\1youtube.com/watch?v=\\2", $youtube_playURL);\r
     }\r
@@ -247,7 +247,7 @@ class ContentUtility {
      *          For instance, http://www.youtube.com/v/a0ryB0m0MiM\r
      *          Otherwise, return the original send-in parameter.\r
      */\r
-    function convertYoutubeWatchURLToPlayURL($youtube_watchURL) {\r
+    public function convertYoutubeWatchURLToPlayURL($youtube_watchURL) {\r
         return preg_replace("/(http:\/\/[a-z0-9\.]*)?youtube.com\/watch\?v=(.*)/",\r
                             "\\1youtube.com/v/\\2", $youtube_watchURL);\r
     }\r
@@ -805,7 +805,7 @@ class ContentUtility {
                        $sql .= " AND srt.type_id=".$only_on_secondary_type;\r
                }\r
                $sql .= " ORDER BY pr.primary_resource_id, prt.type_id";\r
-               \r
+                       \r
                $rows = $dao->execute($sql);\r
        \r
                if (!is_array($rows)) {\r