Unbreak WCFSetup

diff --git a/wcfsetup/install/files/lib/data/style/StyleEditor.class.php b/wcfsetup/install/files/lib/data/style/StyleEditor.class.php
index 276d5fc7f7cdd89137ad129a94dd5884a3c2c0ce..8ac5f06fe31145f032b2ad0a725ab1c6577aab71 100644 (file)
--- a/wcfsetup/install/files/lib/data/style/StyleEditor.class.php
+++ b/wcfsetup/install/files/lib/data/style/StyleEditor.class.php
@@ -362,9 +362,10 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject
         * @param       string          $filename
         * @param       integer         $packageID
         * @param       StyleEditor     $style
+        * @param       boolean         $skipFontDownload
         * @return      StyleEditor
         */
-       public static function import($filename, $packageID = 1, StyleEditor $style = null) {
+       public static function import($filename, $packageID = 1, StyleEditor $style = null, $skipFontDownload = false) {
                // open file
                $tar = new Tar($filename);
                
@@ -659,14 +660,16 @@ class StyleEditor extends DatabaseObjectEditor implements IEditableCachedObject
                        }
                }
                
-               // download google fonts
-               $fontManager = FontManager::getInstance();
-               $family = $style->getVariable('wcfFontFamilyGoogle');
-               try {
-                       $fontManager->downloadFamily($family);
-               }
-               catch (FontDownloadFailed $e) {
-                       // ignore
+               if (!$skipFontDownload) {
+                       // download google fonts
+                       $fontManager = FontManager::getInstance();
+                       $family = $style->getVariable('wcfFontFamilyGoogle');
+                       try {
+                               $fontManager->downloadFamily($family);
+                       }
+                       catch (FontDownloadFailed $e) {
+                               // ignore
+                       }
                }
 
                $tar->close();

diff --git a/wcfsetup/install/files/lib/system/package/plugin/StylePackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/StylePackageInstallationPlugin.class.php
index 6b2cd2bd962655e6490ffa11256e0cb11290c936..5c67bb0419a9ac718c31951194fc5baa6fd61eed 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/plugin/StylePackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/StylePackageInstallationPlugin.class.php
@@ -32,7 +32,7 @@ class StylePackageInstallationPlugin extends AbstractPackageInstallationPlugin {
                $styleEditor = StyleHandler::getInstance()->getStyleByName($this->installation->getPackageName(), false);
                
                // import style
-               $style = StyleEditor::import($filename, $this->installation->getPackageID(), $styleEditor);
+               $style = StyleEditor::import($filename, $this->installation->getPackageID(), $styleEditor, !PACKAGE_ID);
                
                // set style as default
                if (isset($this->instruction['attributes']['default'])) {

diff --git a/wcfsetup/install/files/lib/system/style/StyleCompiler.class.php b/wcfsetup/install/files/lib/system/style/StyleCompiler.class.php
index 534d696a9b1d3f38a8c84f307fdd3229ce43280c..354ae05928c30396b373eec547f06c13880779f7 100644 (file)
--- a/wcfsetup/install/files/lib/system/style/StyleCompiler.class.php
+++ b/wcfsetup/install/files/lib/system/style/StyleCompiler.class.php
@@ -275,7 +275,7 @@ class StyleCompiler extends SingletonFactory {
                }
                
                // add google fonts
-               if (!empty($variables['wcfFontFamilyGoogle'])) {
+               if (!empty($variables['wcfFontFamilyGoogle']) && PACKAGE_ID) {
                        $cssFile = FontManager::getInstance()->getCssFilename(substr($variables['wcfFontFamilyGoogle'], 1, -1));
                        if (is_readable($cssFile)) {
                                $content .= file_get_contents($cssFile);