do not throw an error when no technique has been chosen yet (fixes #8)

selfthinker · Apr 4, 2015 · 3bb2c3a · 3bb2c3a
1 parent aef1317
commit 3bb2c3a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/action.php b/action.php
@@ -41,6 +41,7 @@ function _addFontCode(&$event, $param) {
         $fontSysDir   = $pluginSysDir.'fonts/';
         $fontDir      = $pluginDir.'fonts/';
 
+        $technique    = $this->getConf('technique');
         $fontFileName = $this->getConf('fontFile');
         $fontName     = $this->getConf('fontName');
         $headings     = $this->getConf('headings');
@@ -50,8 +51,13 @@ function _addFontCode(&$event, $param) {
         $CSSfiles = array();
         $CSSembed = '';
 
+        // don't apply anything if no technique is chosen
+        if (empty($technique)) {
+            return false;
+        }
+
         // prepare CSS and JS to embed depending on the technique
-        switch ($this->getConf('technique')) {
+        switch ($technique) {
             case 'fontface':
                 $fontEOT  = $fontFileName.'.eot';
                 $fontWOFF = $fontFileName.'.woff';
@@ -173,8 +179,8 @@ function _addFontCode(&$event, $param) {
         // if not set (for techniques other than cufon and sifr), set them through CSS as usual
         if ( $this->getConf('addStyles') &&
              !empty($headings) &&
-             ($this->getConf('technique')!='cufon') &&
-             ($this->getConf('technique')!='sifr') ) {
+             ($technique!='cufon') &&
+             ($technique!='sifr') ) {
             $CSSembed .= $headings." { font-family: '".$fontName."', ".$this->getConf('genericFamily')."; }";
         }
 

diff --git a/conf/default.php b/conf/default.php
@@ -3,7 +3,7 @@
  * default configuration settings
  */
 
-$conf['technique']     = 'fontface';
+$conf['technique']     = '';
 $conf['fontFile']      = '';
 $conf['fontName']      = '';         // not needed for cufon and sifr (name for typeface is in <fontFile>.typeface.js)
 $conf['headings']      = 'h1';       // without addStyles still needed for: cufon, sifr

diff --git a/conf/metadata.php b/conf/metadata.php
@@ -3,7 +3,7 @@
  * configuration metadata
  */
 
-$meta['technique']     = array('multichoice','_choices' => array('fontface', 'google', 'kernest', 'cufon', 'typeface', 'sifr'));
+$meta['technique']     = array('multichoice','_choices' => array('', 'fontface', 'google', 'kernest', 'cufon', 'typeface', 'sifr'));
 $meta['fontFile']      = array('string');
 $meta['fontName']      = array('string');
 $meta['headings']      = array('multicheckbox','_choices' => array('h1', 'h2', 'h3', 'h4', 'h5'));