Commit c64b0c64 authored by Kevin Stover's avatar Kevin Stover

Merge branch 'release/v2.9.3'

parents 55e23864 2d94dd6d
......@@ -36,9 +36,11 @@ class NF_Forms {
* @since 2.9
* @return array $forms
*/
public function get_all( $debug = false, $show_new = false ) {
public function get_all( $show_new = false ) {
global $wpdb;
$debug = ! empty ( $_REQUEST['debug'] ) ? true : false;
if ( empty ( $this->forms ) ) {
$forms = nf_get_objects_by_type( 'form' );
......
This diff is collapsed.
......@@ -187,6 +187,7 @@ function ninja_forms_activation( $network_wide ){
update_option( 'nf_upgrade_notice', 'closed' );
update_option( 'nf_update_email_settings_complete', true );
update_option( 'nf_email_fav_updated', true );
update_option( 'nf_convert_forms_complete', true );
}
update_option( "ninja_forms_settings", $opt );
......
......@@ -45,9 +45,7 @@ function ninja_forms_tab_form_list(){
do_action( 'nf_admin_before_form_list' );
$debug = ! empty ( $_REQUEST['debug'] ) ? true : false;
$all_forms = Ninja_Forms()->forms()->get_all( $debug );
$all_forms = Ninja_Forms()->forms()->get_all();
$form_count = count($all_forms);
......
......@@ -2,6 +2,11 @@
function nf_get_settings(){
$instance = Ninja_Forms();
$settings = ! empty ( $instance ) ? Ninja_Forms()->plugin_settings : array();
if ( ! empty ( $instance ) && ! empty ( $instance->plugin_settings ) ) {
$settings = Ninja_Forms()->plugin_settings;
} else {
$settings = Ninja_Forms()->get_plugin_settings();
}
return $settings;
} // nf_get_settings
\ No newline at end of file
......@@ -3,7 +3,7 @@
Plugin Name: Ninja Forms
Plugin URI: http://ninjaforms.com/
Description: Ninja Forms is a webform builder with unparalleled ease of use and features.
Version: 2.9.2
Version: 2.9.3
Author: The WP Ninjas
Author URI: http://ninjaforms.com
Text Domain: ninja-forms
......@@ -284,7 +284,7 @@ class Ninja_Forms {
// Plugin version
if ( ! defined( 'NF_PLUGIN_VERSION' ) )
define( 'NF_PLUGIN_VERSION', '2.9.2' );
define( 'NF_PLUGIN_VERSION', '2.9.3' );
// Plugin Folder Path
if ( ! defined( 'NF_PLUGIN_DIR' ) )
......
......@@ -3,7 +3,7 @@ Contributors: wpninjasllc, kstover, jameslaws, wpnzach, daveshine, mordauk, bftr
Tags: form, forms, contact form, custom form, form builder, form creator, form manager, form creation, contact forms, custom forms, forms builder, forms creator, forms manager, forms creation, form administration,
Requires at least: 3.8
Tested up to: 4.1.1
Stable tag: 2.9.2
Stable tag: 2.9.3
License: GPLv2 or later
Forms created with a simple drag and drop interface. Contact forms, Email collection forms, or any other form you want on your WordPress site.
......@@ -74,7 +74,7 @@ For help and video tutorials, please visit our website: [Ninja Forms Documentati
== Upgrade Notice ==
= 2.9.2 (3 March 2015) =
= 2.9.3 (3 March 2015) =
*Changes:*
......@@ -84,6 +84,7 @@ For help and video tutorials, please visit our website: [Ninja Forms Documentati
*Bugs:*
* Fixed a bug that could prompt users to run unnecessary updates on their site.
* Preview pages should now always display properly.
* Success messages should now always be shown after submission properly.
* Fixed a bug that could cause a PHP notice to show in placeholders.
......@@ -100,6 +101,12 @@ If you have any feature requests, please feel free to visit [ninjaforms.com](htt
== Changelog ==
= 2.9.3 (4 March 2015) =
*Bugs:*
* Fixed a bug that could prompt users to run unnecessary updates on their site.
= 2.9.2 (3 March 2015) =
*Bugs:*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment