wait #5939 @0.75

diff --git a/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php b/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php
index 96f40e9744dd7e6c977d6f3e99d96289c356f46b..fa284fec5566b2de893c0f484f607c77d66a0b33 100644 (file)
--- a/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php
+++ b/app/Http/Controllers/Admin/Operations/FluidbookPublication/PreviewOperation.php
@@ -109,9 +109,6 @@ trait PreviewOperation
      */
     public function preview($version, $fluidbook, $theme, $path = 'index.html')
     {
-        $nointerface = !!request('nointerface', false);
-        $shortLoading = !!request('shortLoading', false);
-
         $isScorm = $version === 'scorm';
 
         $dest = $fluidbook->getFinalPath($theme, $isScorm);

diff --git a/app/Models/AuthUser.php b/app/Models/AuthUser.php
index 67afb7d3d23c2c345fd457b6a57198e42e2c9ba8..3650fc693ad4c06337722a1c4b195db094aa885a 100644 (file)
--- a/app/Models/AuthUser.php
+++ b/app/Models/AuthUser.php
@@ -16,7 +16,9 @@ class AuthUser extends User
 
     public function avatar()
     {
-        return Gravatar::get($this->email);
+
+        $res = Gravatar::get($this->email);
+        return str_replace('.jpg', '', $res);
     }
 
 

diff --git a/app/Models/FluidbookTheme.php b/app/Models/FluidbookTheme.php
index d56bcc9d67d5a80d19faa48d39a563314f7ce238..fcb9f95eb379474dc55aaf56585731c37158783a 100644 (file)
--- a/app/Models/FluidbookTheme.php
+++ b/app/Models/FluidbookTheme.php
@@ -800,7 +800,7 @@ class FluidbookTheme extends ToolboxSettingsModel
 
     public static function getThemePreviewURL($id, $params = [], $page = 2)
     {
-        $defaultParams = ['version' => 'online', 'id' => '20098-' . $id, 'hash' => 'f2e0452eed6dba9878016ce5603fdc54', 'time' => time(), 'nointerface' => 1, 'force' => 0, 'shortLoading' => 1, 'puppeteer' => 0];
+        $defaultParams = ['version' => 'online', 'id' => '20098-' . $id, 'hash' => 'f2e0452eed6dba9878016ce5603fdc54', 'time' => time(), 'path' => 'index.html', 'nointerface' => 1, 'force' => 0, 'shortLoading' => 1, 'puppeteer' => 0];
         return route('fluidbook_preview_with_time', array_merge($defaultParams, $params));
     }