Commit 8ed14ee0 authored by Lisa Seeto's avatar Lisa Seeto
Browse files

Bug 1892790: Google Apps Block unable to parse URL to google drive folder



 - added new pattern to match drive.google.com/folders

Change-Id: I0df15ec721eb88fadc1d9ae7ffa5cdef6313171b
Signed-off-by: default avatarLisa Seeto <lisaseeto@catalyst.net.nz>
(cherry picked from commit 2c46d657)
parent 4d152d4c
......@@ -128,7 +128,7 @@ class PluginBlocktypeGoogleApps extends MaharaCoreBlocktype {
'url' => $httpstr . '://drive.google.com/$1folderview?id=$2',
'type' => 'spanicon',
),
// drive.google.com/folderview or drive.google.com/open - Google Drive folders
// drive.google.com/folderview or drive.google.com/open or drive.google.com/folders - Google Drive folders
// (formerly Google Docs collections)
array(
'match' => '#.*drive.google.com/([a-zA-Z0-9\_\-\.\/]*)open\?id=([a-zA-Z0-9\_\-]+).*#',
......@@ -140,6 +140,11 @@ class PluginBlocktypeGoogleApps extends MaharaCoreBlocktype {
'url' => $httpstr . '://drive.google.com/$1folderview?id=$2',
'type' => 'spanicon',
),
array(
'match' => '#.*drive.google.com/drive/folders/([a-zA-Z0-9\_\-\.\/]*)#',
'url' => $httpstr . '://drive.google.com/drive/folders/$1',
'type' => 'spanicon',
),
// docs.google.com/present - Google presentation incl. custom domain presentation
// $1 - domain, e.g. /a/domainname/
// $2 - present or presentation
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment