Merge pull request #235 from codepress/release/3.2.7

DGStefan · web-flow · commit 5f7b29edb9da · 2018-09-25T09:23:09.000+02:00
Release/3.2.7
diff --git a/assets/js/admin-page-columns.js b/assets/js/admin-page-columns.js
diff --git a/assets/js/admin-page-columns.js.map b/assets/js/admin-page-columns.js.map
diff --git a/classes/AdminColumns.php b/classes/AdminColumns.php
@@ -179,7 +179,7 @@ protected function get_version_key() {
 	 * @return string
 	 */
 	public function get_version() {
-		return '3.2.6';
+		return '3.2.7';
 	}
 
 	/**
diff --git a/classes/Column/Post/Title.php b/classes/Column/Post/Title.php
@@ -14,8 +14,4 @@ public function __construct() {
 		$this->set_type( 'title' );
 	}
 
-	public function is_valid() {
-		return post_type_supports( $this->get_post_type(), 'title' );
-	}
-
 }
diff --git a/classes/ListScreen.php b/classes/ListScreen.php
@@ -744,14 +744,16 @@ public function store( $column_data ) {
 			}
 
 			// Encode site url
-			if ( $setting = $column->get_setting( 'label' ) ) {
+			$setting = $column->get_setting( 'label' );
+
+			if ( $setting ) {
 				$sanitized[ $setting->get_name() ] = $setting->get_encoded_label();
 			}
 
 			$settings[ $column_name ] = array_merge( $options, $sanitized );
 		}
 
-		$result = update_option( self::OPTIONS_KEY . $this->get_storage_key(), $settings );
+		$result = update_option( self::OPTIONS_KEY . $this->get_storage_key(), $settings, false );
 
 		if ( ! $result ) {
 			return new WP_Error( 'same-settings' );
@@ -820,7 +822,7 @@ private function get_default_key() {
 	 * @return bool
 	 */
 	public function save_default_headings( $column_headings ) {
-		return update_option( $this->get_default_key(), $column_headings );
+		return update_option( $this->get_default_key(), $column_headings, false );
 	}
 
 	/**
diff --git a/classes/Plugin.php b/classes/Plugin.php
@@ -123,7 +123,7 @@ public function update_stored_version( $version = null ) {
 			$version = $this->get_version();
 		}
 
-		return update_option( $this->get_version_key(), $version );
+		return update_option( $this->get_version_key(), $version, false );
 	}
 
 	/**
diff --git a/classes/Plugin/Update/V3007.php b/classes/Plugin/Update/V3007.php
@@ -55,7 +55,7 @@ private function update_roles_column() {
 			}
 
 			if ( $update ) {
-				update_option( $row->option_name, $options );
+				update_option( $row->option_name, $options, false );
 			}
 		}
 	}
diff --git a/classes/Storage/Option.php b/classes/Storage/Option.php
@@ -18,6 +18,8 @@ public function __construct( $key ) {
 	 * @return mixed
 	 */
 	public function get() {
+		wp_cache_delete( $this->key, 'options' );
+
 		return get_option( $this->key );
 	}
 
diff --git a/codepress-admin-columns.php b/codepress-admin-columns.php
@@ -1,12 +1,12 @@
 <?php
 /*
 Plugin Name: Admin Columns
-Version: 3.2.6
+Version: 3.2.7
 Description: Customize columns on the administration screens for post(types), pages, media, comments, links and users with an easy to use drag-and-drop interface.
 Author: AdminColumns.com
 Author URI: https://www.admincolumns.com
 Plugin URI: https://www.admincolumns.com
-Requires PHP: 5.3
+Requires PHP: 5.3.6
 Text Domain: codepress-admin-columns
 Domain Path: /languages
 License: GPL v3
diff --git a/languages/codepress-admin-columns-sv_SE.mo b/languages/codepress-admin-columns-sv_SE.mo
diff --git a/languages/codepress-admin-columns-sv_SE.po b/languages/codepress-admin-columns-sv_SE.po
@@ -2,7 +2,7 @@
 # This file is distributed under the same license as the Plugins - Admin Columns - Stable (latest release) package.
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2018-08-14 14:55:44+0000\n"
+"PO-Revision-Date: 2018-09-04 09:58:25+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -372,7 +372,7 @@ msgstr "Använd en ikon?"
 
 #: classes/Helper/Strings.php:104
 msgid "&hellip;"
-msgstr ""
+msgstr "&hellip;"
 
 #: classes/Column/Post/Excerpt.php:22
 msgid "Current excerpt is generated from the content."
@@ -1244,7 +1244,7 @@ msgstr ""
 
 #: classes/Settings/Column/PostLink.php:71
 msgid "Edit Post Author"
-msgstr ""
+msgstr "Redigera inläggsförfattare"
 
 #: classes/Settings/Column/PostLink.php:70
 msgid "View Post"
diff --git a/readme.txt b/readme.txt
@@ -4,8 +4,8 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
 Tags: plugins, wordpress, admin, column, columns, custom columns, custom fields, image, dashboard, sortable, filters, posts, media, users, pages, posttypes, manage columns, wp-admin
 Requires at least: 4.5
 Tested up to: 4.9.8
-Requires PHP: 5.3
-Stable tag: 3.2.6
+Requires PHP: 5.3.6
+Stable tag: 3.2.7
 
 Customise columns on the administration screens for post(types), pages, media, comments, links and users with an easy to use drag-and-drop interface.
 
@@ -206,13 +206,20 @@ You can find a list of the available actions and filters (and examples on how to
 2. Posts Screen with the customized sortable columns.
 3. Settings page for the Media Library columns.
 4. Media Screen with the customized sortable columns.
-5. Settings page for Users columns.
+5. Settings page for Users columns../ch
 6. Users Screen with the customized sortable columns.
 7. Settings page showing the different displaying types for custom field.
 8. Posts Screen with custom fields.
 
 == Changelog ==
 
+= 3.2.7 =
+Release Date: September 25th, 2018
+
+* [Fixed] jQuery noConflict fixes for column settings page
+* [Improved] Post title column is now always available
+* [Improved] Disable autoloading for ACP options
+
 = 3.2.6 =
 Release Date: August 21th, 2018
 
diff --git a/src/js/admin/columns/column.js b/src/js/admin/columns/column.js
@@ -87,7 +87,7 @@ class Column {
 
 		this.bindSettings();
 
-		$( document ).trigger( 'AC_Column_InitSettings', [ column ] );
+		jQuery( document ).trigger( 'AC_Column_InitSettings', [ column ] );
 
 		return this;
 	}
@@ -176,7 +176,7 @@ class Column {
 					self.bindEvents();
 					self.open();
 
-					$( document ).trigger( 'AC_Column_Change', [ self ] );
+					jQuery( document ).trigger( 'AC_Column_Change', [ self ] );
 				} else {
 					self.showMessage( response.data.error )
 				}
@@ -220,7 +220,7 @@ class Column {
 					self.bindEvents();
 					self.open();
 
-					$( document ).trigger( 'AC_Column_Refresh', [ self ] );
+					jQuery( document ).trigger( 'AC_Column_Refresh', [ self ] );
 				}
 			}
 
@@ -234,7 +234,7 @@ class Column {
 		this.initNewInstance();
 		this.bindEvents();
 
-		$( document ).trigger( 'AC_Column_Created', [ self ] );
+		jQuery( document ).trigger( 'AC_Column_Created', [ self ] );
 		return this;
 	}
 
diff --git a/src/js/admin/columns/events/addons.js b/src/js/admin/columns/events/addons.js
@@ -4,6 +4,7 @@
  */
 
 let addons = function( column ) {
+	let $ = jQuery;
 	let $column = column.$el;
 	let inputs = $column.find( '[data-trigger] label' );
 
diff --git a/src/js/admin/columns/events/indicator.js b/src/js/admin/columns/events/indicator.js
@@ -2,6 +2,7 @@ let indicator = function( column ) {
 	let $column = column.$el;
 
 	$column.find( '.ac-column-header [data-indicator-toggle]' ).each( function() {
+		let $ = jQuery;
 		let $indicator = $( this );
 		let setting = $( this ).data( 'setting' );
 		let $setting = $column.find( '.ac-column-setting[data-setting=' + setting + ']' );
diff --git a/src/js/admin/columns/events/refresh.js b/src/js/admin/columns/events/refresh.js
@@ -1,4 +1,6 @@
 let refresh = function( column ) {
+	let $ = jQuery;
+	
 	column.$el.find( '[data-refresh="column"]' ).on( 'change', function() {
 		// Allow plugins to hook into this event
 		$( document ).trigger( 'AC.column.prerefresh', column.$el );
diff --git a/src/js/admin/columns/events/type-selector.js b/src/js/admin/columns/events/type-selector.js
@@ -1,4 +1,5 @@
 let selector = function( column ) {
+	let $ = jQuery;
 	column.$el.find( 'select.ac-setting-input_type' ).change( function() {
 		column.$el.addClass( 'loading' );
 		column.switchToType( $( this ).val() ).always( function() {
diff --git a/src/js/admin/columns/form.js b/src/js/admin/columns/form.js
@@ -7,7 +7,7 @@ class Form {
 		this.$container = jQuery( '#cpac .ac-admin' );
 		this.columns = {};
 
-		$( document ).trigger( 'AC_Form_Loaded' );
+		jQuery( document ).trigger( 'AC_Form_Loaded' );
 
 		this.init();
 	}
@@ -17,7 +17,7 @@ class Form {
 		this.bindFormEvents();
 		this.bindOrdering();
 
-		$( document ).trigger( 'AC_Form_Ready' );
+		jQuery( document ).trigger( 'AC_Form_Ready' );
 	}
 
 	bindOrdering() {
@@ -150,7 +150,7 @@ class Form {
 		} );
 
 		//document.dispatchEvent( new CustomEvent( 'AC_Form_AfterUpdate', { detail : { container : self.$container } } ) );
-		$( document ).trigger( 'AC_Form_AfterUpdate', [ self.$container ] );
+		jQuery( document ).trigger( 'AC_Form_AfterUpdate', [ self.$container ] );
 
 		return xhr;
 	}
@@ -194,7 +194,7 @@ class Form {
 
 		jQuery( 'html, body' ).animate( { scrollTop : column.$el.offset().top - 58 }, 300 );
 
-		$( document ).trigger( 'AC_Column_Added', [ column ] );
+		jQuery( document ).trigger( 'AC_Column_Added', [ column ] );
 
 		return column;
 	}
diff --git a/src/js/admin/columns/modal.js b/src/js/admin/columns/modal.js
@@ -8,7 +8,7 @@ class Modal {
 
 	static initGlobalEvents() {
 
-		$( document ).on( 'click', '[data-ac-open-modal]', function( e ) {
+		jQuery( document ).on( 'click', '[data-ac-open-modal]', function( e ) {
 			e.preventDefault();
 			let target = e.target.dataset.acOpenModal;
 			let el = document.querySelector( target );
diff --git a/src/js/admin/columns/settings/date.js b/src/js/admin/columns/settings/date.js
@@ -1,4 +1,5 @@
 let date = function( column ) {
+	let $ = jQuery;
 	let $column = column.$el;
 	let $setting = $column.find( '.ac-column-setting--date' );
 
diff --git a/src/js/admin/columns/settings/sub-setting-toggle.js b/src/js/admin/columns/settings/sub-setting-toggle.js
@@ -1,4 +1,5 @@
 let subsetting = function( column ) {
+	let $ = jQuery;
 	let settings = {
 		value_show : "on",
 		subfield : '.ac-column-setting'
diff --git a/src/js/admin/columns/settings/width.js b/src/js/admin/columns/settings/width.js
@@ -1,6 +1,6 @@
 // Settings fields: Width
 jQuery.fn.column_width_slider = function() {
-
+	let $ = jQuery;
 	let $column_width = $( this ).find( '.ac-setting-input-width' );
 	let input_width = $column_width.find( '.description input' ),
 		input_unit = $column_width.find( '.unit-select input' ),

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ protected function get_version_key() {`
`179`	`179`	`* @return string`
`180`	`180`	`*/`
`181`	`181`	`public function get_version() {`
`182`		`- return '3.2.6';`
	`182`	`+ return '3.2.7';`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,4 @@ public function __construct() {`
`14`	`14`	`$this->set_type( 'title' );`
`15`	`15`	`}`
`16`	`16`
`17`		`- public function is_valid() {`
`18`		`- return post_type_supports( $this->get_post_type(), 'title' );`
`19`		`- }`
`20`		`-`
`21`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -744,14 +744,16 @@ public function store( $column_data ) {`
`744`	`744`	`}`
`745`	`745`
`746`	`746`	`// Encode site url`
`747`		`- if ( $setting = $column->get_setting( 'label' ) ) {`
	`747`	`+ $setting = $column->get_setting( 'label' );`
	`748`	`+`
	`749`	`+ if ( $setting ) {`
`748`	`750`	`$sanitized[ $setting->get_name() ] = $setting->get_encoded_label();`
`749`	`751`	`}`
`750`	`752`
`751`	`753`	`$settings[ $column_name ] = array_merge( $options, $sanitized );`
`752`	`754`	`}`
`753`	`755`
`754`		`- $result = update_option( self::OPTIONS_KEY . $this->get_storage_key(), $settings );`
	`756`	`+ $result = update_option( self::OPTIONS_KEY . $this->get_storage_key(), $settings, false );`
`755`	`757`
`756`	`758`	`if ( ! $result ) {`
`757`	`759`	`return new WP_Error( 'same-settings' );`
`@@ -820,7 +822,7 @@ private function get_default_key() {`
`820`	`822`	`* @return bool`
`821`	`823`	`*/`
`822`	`824`	`public function save_default_headings( $column_headings ) {`
`823`		`- return update_option( $this->get_default_key(), $column_headings );`
	`825`	`+ return update_option( $this->get_default_key(), $column_headings, false );`
`824`	`826`	`}`
`825`	`827`
`826`	`828`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public function update_stored_version( $version = null ) {`
`123`	`123`	`$version = $this->get_version();`
`124`	`124`	`}`
`125`	`125`
`126`		`- return update_option( $this->get_version_key(), $version );`
	`126`	`+ return update_option( $this->get_version_key(), $version, false );`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ private function update_roles_column() {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`if ( $update ) {`
`58`		`- update_option( $row->option_name, $options );`
	`58`	`+ update_option( $row->option_name, $options, false );`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@ public function __construct( $key ) {`
`18`	`18`	`* @return mixed`
`19`	`19`	`*/`
`20`	`20`	`public function get() {`
	`21`	`+ wp_cache_delete( $this->key, 'options' );`
	`22`	`+`
`21`	`23`	`return get_option( $this->key );`
`22`	`24`	`}`
`23`	`25`