Merge "Add another new google doc url formats (bug #856130)"

htdocs/blocktype/googleapps/lib.php

@@ -156,6 +156,14 @@ class PluginBlocktypeGoogleApps extends SystemBlocktype {
             // docs.google.com - Google document (after Sept 2011) incl. custom domain document
             // $1 - domain, e.g. /a/domainname/
             // $2 - id, key, etc. of the document
+            array(
+                'match' => '#.*docs.google.com/([a-zA-Z0-9\_\-\.\/]*)document/d/([a-zA-Z0-9\_\-]+).*#',
+                'url'   => $httpstr . '://docs.google.com/$1document/pub?id=$2',
+                'type'  => 'iframe',
+            ),
+            // docs.google.com - Google spreadsheet document (after Sept 2011) incl. custom domain document
+            // $1 - domain, e.g. /a/domainname/
+            // $2 - id, key, etc. of the document
             array(
                 'match' => '#.*docs.google.com/([a-zA-Z0-9\_\-\.\/]*)spreadsheet/.*key=([a-zA-Z0-9\_\-]+).*#',
                 'url'   => $httpstr . '://docs.google.com/$1spreadsheet/pub?key=$2',