Commit 6150804f authored by Aaron Wells's avatar Aaron Wells Committed by Robert Lyon
Browse files

Bug 1600665: Support for new Google Calendar embed URL 

Change-Id: I8318010bb02d4e464490bc5447cf58d2a15ad949
behatnotneeded: Can't test Google embeds in Behat
(cherry picked from commit d767340d)
parent e5b0530a

htdocs/blocktype/googleapps/lib.php

+8 −2
Original line number Diff line number Diff line
@@ -266,7 +266,13 @@ class PluginBlocktypeGoogleApps extends MaharaCoreBlocktype { 
            // www.google.com/calendar - Google calendar

            array(

                'match' => '#.*www.google.com/calendar.*src=([a-zA-Z0-9\.\_\-\&\%\=/]+).*#',

                'url'   => $httpstr . '://www.google.com/calendar/embed?src=$1',

                'url'   => $httpstr . '://calendar.google.com/calendar/embed?src=$1',

                'type'  => 'iframe',

            ),

            // calendar.google.com - Google Calendar (mid-2016)

            array(

                'match' => '#.*calendar.google.com/calendar.*src=([a-zA-Z0-9\.\_\-\&\%\=/]+).*#',

                'url'   => $httpstr . '://calendar.google.com/calendar/embed?src=$1',

                'type'  => 'iframe',

            ),

            // (maps|www).google.com - Google My Maps (IMPORTANT: this is ONLY for My Maps)