minor mistakes with options fixed

nida78 · Dec 5, 2020 · 8dec32e · 8dec32e
1 parent 08fffd8
commit 8dec32e
Show file tree

Hide file tree

Showing 4 changed files with 168 additions and 125 deletions.
diff --git a/class.wp-wiki-tooltip-base.php b/class.wp-wiki-tooltip-base.php
@@ -21,7 +21,9 @@ protected function load_single_option( $default_key, $old_options, $new_options,
         if( false == $new_options ) {
             if( false != $old_options ) {
                 foreach( $keys as $key ) {
-                    $options_to_load[ $key ] = $old_options[ $key ];
+                    if( isset( $old_options[ $key ] ) ) {
+                        $new_options[ $key ] = $old_options[ $key ];
+                    }
                 }
             } else {
                 $new_options = $default_options[ $default_key ];

diff --git a/class.wp-wiki-tooltip.php b/class.wp-wiki-tooltip.php
@@ -72,7 +72,7 @@ public function add_wiki_container() {
 			$this->options_thumb[ 'thumb-width' ],
             $this->options_thumb[ 'thumb-align' ],
 			$this->options_base[ 'trigger' ],
-			$this->options_base[ 'trigger-hover-action' ],
+            ( $this->options_base[ 'trigger' ] == 'hover' ) ? $this->options_base[ 'trigger-hover-action' ] : '',
             $this->options_base[ 'a-target' ],
 			$this->options_base[ 'min-screen-width' ],
 			$this->options_error[ 'page-error-handling' ],
@@ -95,6 +95,8 @@ public function do_wiki_shortcode( $atts, $content ) {
 		$title = ( $params[ 'title' ] == '' ) ? $content : $params[ 'title' ];
 
 		$wiki_base_id = $params[ 'base' ];
+
+        $this->load_all_options();
 		$wiki_urls = $this->options_base[ 'wiki-urls' ];
 
 		if( $wiki_base_id == '' ) {

diff --git a/languages/wp-wiki-tooltip-de_DE_formal.mo b/languages/wp-wiki-tooltip-de_DE_formal.mo