Commit 8ff2f254 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1600668: Support for new Google Drive folders URLs"

parents 9c1fba4b 0e48b3bd
......@@ -105,12 +105,24 @@ class PluginBlocktypeGoogleApps extends MaharaCoreBlocktype {
// $2 - id, key, etc. of the collection
array(
'match' => '#.*docs.google.com/([a-zA-Z0-9\_\-\.\/]*)leaf\?id=([a-zA-Z0-9\_\-]+).*#',
'url' => $httpstr . '://docs.google.com/$1leaf?id=$2',
'url' => $httpstr . '://drive.google.com/$1folderview?id=$2',
'type' => 'spanicon',
),
array(
'match' => '#.*docs.google.com/([a-zA-Z0-9\_\-\.\/]*)open\?id=([a-zA-Z0-9\_\-]+).*#',
'url' => $httpstr . '://docs.google.com/$1open?id=$2',
'url' => $httpstr . '://drive.google.com/$1folderview?id=$2',
'type' => 'spanicon',
),
// drive.google.com/folderview or drive.google.com/open - Google Drive folders
// (formerly Google Docs collections)
array(
'match' => '#.*drive.google.com/([a-zA-Z0-9\_\-\.\/]*)open\?id=([a-zA-Z0-9\_\-]+).*#',
'url' => $httpstr . '://drive.google.com/$1folderview?id=$2',
'type' => 'spanicon',
),
array(
'match' => '#.*drive.google.com/([a-zA-Z0-9\_\-\.\/]*)folderview\?id=([a-zA-Z0-9\_\-]+).*#',
'url' => $httpstr . '://drive.google.com/$1folderview?id=$2',
'type' => 'spanicon',
),
// docs.google.com/present - Google presentation incl. custom domain presentation
......
Supports Markdown
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