Ultimate FAQ - Version 1.1.13

Version Description

  • Fixed a number of PHP notices
Download this release

Release Info

Developer Rustaurius
Plugin Icon 128x128 Ultimate FAQ
Version 1.1.13
Comparing to
See all releases

Code changes from version 1.1.11 to 1.1.13

Files changed (7) hide show
  1. Functions/EWD_UFAQ_Add_Views_Column.php +1 -1
  2. Functions/EWD_UFAQ_Version_Update.php +1 -1
  3. Main.php +1 -1
  4. Shortcodes/DisplayFAQs.php +9 -7
  5. css/ewd-ufaq-styles.css +1 -1
  6. html/OptionsPage.php +2 -1
  7. readme.txt +6 -0
Functions/EWD_UFAQ_Add_Views_Column.php CHANGED
@@ -74,7 +74,7 @@ function EWD_UFAQ_Get_Views($post_ID) {
74
  }
75
  }
76
 
77
- function EWD_UFAQ_Get_Categories($post_ID) {
78
  echo get_the_term_list($post_id, 'ufaq-category', '', ', ', '').PHP_EOL;
79
  }
80
 
74
  }
75
  }
76
 
77
+ function EWD_UFAQ_Get_Categories($post_id) {
78
  echo get_the_term_list($post_id, 'ufaq-category', '', ', ', '').PHP_EOL;
79
  }
80
 
Functions/EWD_UFAQ_Version_Update.php CHANGED
@@ -42,7 +42,7 @@ function EWD_UFAQ_Version_Update_Box() {
42
  <h3 class='hndle'><span><?php _e("Thank You!", 'EWD_UFAQ') ?></span></h3>
43
  <div class="inside">
44
  <?php if (get_option("EWD_UFAQ_Install_Flag") == "Yes") { ?><ul><li><?php _e("Thanks for installing the Ultimate Product Catalogue Plugin.", "EWD_UFAQ"); ?><br> <a href='https://www.youtube.com/channel/UCZPuaoetCJB1vZOmpnMxJNw'><?php _e("Subscribe to our YouTube channel ", "EWD_UFAQ"); ?></a> <?php _e("for tutorial videos on this and our other plugins!", "EWD_UFAQ");?> </li></ul>
45
- <?php } else { ?><ul><li><?php _e("Thanks for upgrading to version 1.1.11!", "EWD_UFAQ"); ?><br> <a href='https://wordpress.org/support/view/plugin-reviews/ultimate-faqs?filter=5'><?php _e("Please rate our plugin", "EWD_UFAQ"); ?></a> <?php _e("if you find Ultimate FAQs useful!", "EWD_UFAQ");?> </li></ul><?php } ?>
46
 
47
  <?php /* if (get_option("EWD_UFAQ_Install_Flag") == "Yes") { ?><ul><li><?php _e("Thanks for installing the Ultimate Product Catalogue Plugin.", "EWD_UFAQ"); ?><br> <a href='http://www.facebook.com/EtoileWebDesign'><?php _e("Follow us on Facebook", "EWD_UFAQ"); ?></a> <?php _e("to suggest new features or hear about upcoming ones!", "EWD_UFAQ");?> </li></ul>
48
  <?php } else { ?><ul><li><?php _e("Thanks for upgrading to version 2.2.9!", "EWD_UFAQ"); ?><br> <a href='http://www.facebook.com/EtoileWebDesign'><?php _e("Follow us on Facebook", "EWD_UFAQ"); ?></a> <?php _e("to suggest new features or hear about upcoming ones!", "EWD_UFAQ");?> </li></ul><?php } */ ?>
42
  <h3 class='hndle'><span><?php _e("Thank You!", 'EWD_UFAQ') ?></span></h3>
43
  <div class="inside">
44
  <?php if (get_option("EWD_UFAQ_Install_Flag") == "Yes") { ?><ul><li><?php _e("Thanks for installing the Ultimate Product Catalogue Plugin.", "EWD_UFAQ"); ?><br> <a href='https://www.youtube.com/channel/UCZPuaoetCJB1vZOmpnMxJNw'><?php _e("Subscribe to our YouTube channel ", "EWD_UFAQ"); ?></a> <?php _e("for tutorial videos on this and our other plugins!", "EWD_UFAQ");?> </li></ul>
45
+ <?php } else { ?><ul><li><?php _e("Thanks for upgrading to version 1.1.13!", "EWD_UFAQ"); ?><br> <a href='https://wordpress.org/support/view/plugin-reviews/ultimate-faqs?filter=5'><?php _e("Please rate our plugin", "EWD_UFAQ"); ?></a> <?php _e("if you find Ultimate FAQs useful!", "EWD_UFAQ");?> </li></ul><?php } ?>
46
 
47
  <?php /* if (get_option("EWD_UFAQ_Install_Flag") == "Yes") { ?><ul><li><?php _e("Thanks for installing the Ultimate Product Catalogue Plugin.", "EWD_UFAQ"); ?><br> <a href='http://www.facebook.com/EtoileWebDesign'><?php _e("Follow us on Facebook", "EWD_UFAQ"); ?></a> <?php _e("to suggest new features or hear about upcoming ones!", "EWD_UFAQ");?> </li></ul>
48
  <?php } else { ?><ul><li><?php _e("Thanks for upgrading to version 2.2.9!", "EWD_UFAQ"); ?><br> <a href='http://www.facebook.com/EtoileWebDesign'><?php _e("Follow us on Facebook", "EWD_UFAQ"); ?></a> <?php _e("to suggest new features or hear about upcoming ones!", "EWD_UFAQ");?> </li></ul><?php } */ ?>
Main.php CHANGED
@@ -7,7 +7,7 @@ Author: Etoile Web Design
7
  Author URI: http://www.EtoileWebDesign.com/wordpress-plugins/
8
  Terms and Conditions: http://www.etoilewebdesign.com/plugin-terms-and-conditions/
9
  Text Domain: EWD_UFAQ
10
- Version: 1.1.11
11
  */
12
 
13
  global $ewd_ufaq_message;
7
  Author URI: http://www.EtoileWebDesign.com/wordpress-plugins/
8
  Terms and Conditions: http://www.etoilewebdesign.com/plugin-terms-and-conditions/
9
  Text Domain: EWD_UFAQ
10
+ Version: 1.1.13
11
  */
12
 
13
  global $ewd_ufaq_message;
Shortcodes/DisplayFAQs.php CHANGED
@@ -104,7 +104,7 @@ function Display_FAQs($atts) {
104
 
105
  if (isset($_GET['include_tag'])) {$include_tag = $_GET['include_tag'];}
106
  if (get_query_var('ufaq_tag_slug') != "") {$include_tag = get_query_var('ufaq_tag_slug');}
107
- if ($include_tag != "" ) {$include_tag_array = explode(",", $include_tag);}
108
  else {$include_tag_array = array();}
109
  if (sizeOf($include_tag_array) > 0) {
110
  $include_tag_filter_array = array( 'taxonomy' => 'ufaq-tag',
@@ -150,18 +150,20 @@ function Display_FAQs($atts) {
150
  'terms' => $Category->slug
151
  );
152
  }
 
 
 
 
 
 
153
 
154
  $params = array('posts_per_page' => $post_count,
155
  'post_type' => 'ufaq',
156
  'orderby' => $orderby,
157
  'order' => $order,
158
- 'tax_query' => array('relation' => 'AND',
159
- $include_category_filter_array,
160
- $exclude_category_filter_array,
161
- $include_tag_filter_array,
162
- $category_array
163
- )
164
  );
 
165
  if ($search_string != "") {$params['s'] = $search_string;}
166
  if ($orig_order_setting == "popular") {$params['meta_key'] = 'ufaq_view_count';}
167
  if ($orig_order_setting == "set_order") {$params['meta_key'] = 'ufaq_order';}
104
 
105
  if (isset($_GET['include_tag'])) {$include_tag = $_GET['include_tag'];}
106
  if (get_query_var('ufaq_tag_slug') != "") {$include_tag = get_query_var('ufaq_tag_slug');}
107
+ if (isset($include_tag) and $include_tag != "" ) {$include_tag_array = explode(",", $include_tag);}
108
  else {$include_tag_array = array();}
109
  if (sizeOf($include_tag_array) > 0) {
110
  $include_tag_filter_array = array( 'taxonomy' => 'ufaq-tag',
150
  'terms' => $Category->slug
151
  );
152
  }
153
+
154
+ $tax_query_array = array('relation' => 'AND');
155
+ if (isset($include_category_filter_array)) {$tax_query_array[] = $include_category_filter_array;}
156
+ if (isset($exclude_category_filter_array)) {$tax_query_array[] = $exclude_category_filter_array;}
157
+ if (isset($include_tag_filter_array)) {$tax_query_array[] = $include_tag_filter_array;}
158
+ if (isset($category_array)) {$tax_query_array[] = $category_array;}
159
 
160
  $params = array('posts_per_page' => $post_count,
161
  'post_type' => 'ufaq',
162
  'orderby' => $orderby,
163
  'order' => $order,
164
+ 'tax_query' => $tax_query_array
 
 
 
 
 
165
  );
166
+ unset($tax_query_array);
167
  if ($search_string != "") {$params['s'] = $search_string;}
168
  if ($orig_order_setting == "popular") {$params['meta_key'] = 'ufaq_view_count';}
169
  if ($orig_order_setting == "set_order") {$params['meta_key'] = 'ufaq_order';}
css/ewd-ufaq-styles.css CHANGED
@@ -150,4 +150,4 @@ List Style
150
  ***********************/
151
  .ufaq-faq-header-title a{
152
  display: inline-block;
153
- }
150
  ***********************/
151
  .ufaq-faq-header-title a{
152
  display: inline-block;
153
+ }
html/OptionsPage.php CHANGED
@@ -66,7 +66,8 @@
66
  $UFAQ_Styling_Category_Font_Color = get_option("EWD_UFAQ_Styling_Category_Font_Color");
67
  $UFAQ_Styling_Category_Margin = get_option("EWD_UFAQ_Styling_Category_Margin");
68
  $UFAQ_Styling_Category_Padding = get_option("EWD_UFAQ_Styling_Category_Padding");
69
-
 
70
  ?>
71
  <div class="wrap ufaq-options-page-tabbed">
72
  <div class="ufaq-options-submenu-div">
66
  $UFAQ_Styling_Category_Font_Color = get_option("EWD_UFAQ_Styling_Category_Font_Color");
67
  $UFAQ_Styling_Category_Margin = get_option("EWD_UFAQ_Styling_Category_Margin");
68
  $UFAQ_Styling_Category_Padding = get_option("EWD_UFAQ_Styling_Category_Padding");
69
+
70
+ if (!isset($Display_Tab)) {$Display_Tab = "";}
71
  ?>
72
  <div class="wrap ufaq-options-page-tabbed">
73
  <div class="ufaq-options-submenu-div">
readme.txt CHANGED
@@ -126,6 +126,12 @@ For more questions and support you can post in the support forum:
126
  9. All answers displayed in the 'list' FAQ mode
127
 
128
  == Changelog ==
 
 
 
 
 
 
129
  = 1.1.11 =
130
  - Fixed a missing div error that could come up with certain options selected
131
 
126
  9. All answers displayed in the 'list' FAQ mode
127
 
128
  == Changelog ==
129
+ = 1.1.13 =
130
+ - Fixed a number of PHP notices
131
+
132
+ = 1.1.12 =
133
+ - Minor CSS update
134
+
135
  = 1.1.11 =
136
  - Fixed a missing div error that could come up with certain options selected
137