Merge pull request #245 from codepress/release/3.4.2

Release/3.4.2

Author: DGStefan

assets/js/admin-page-columns.js

@@ -121,8 +121,12 @@ public function admin_scripts() {
 		$params = $ajax_handler->get_params();
 
 		$params['i18n'] = array(
-			'clone' => __( '%s column is already present and can not be duplicated.', 'codepress-admin-columns' ),
-			'error' => __( 'Invalid response.', 'codepress-admin-columns' ),
+			'clone'  => __( '%s column is already present and can not be duplicated.', 'codepress-admin-columns' ),
+			'error'  => __( 'Invalid response.', 'codepress-admin-columns' ),
+			'errors' => array(
+				'save_settings' => __( 'There was an error during saving the column settings.', 'codepress-admin-columns' ),
+				'loading_column'      => __( 'The column could not be loaded because of an unknown error', 'codepress-admin-columns' ),
+			),
 		);
 
 		wp_localize_script( 'ac-admin-page-columns', 'AC', $params );

assets/js/admin-page-columns.js.map

@@ -73,13 +73,13 @@ private function __construct() {
 		}
 
 		$this->register_admin();
+		$this->localize();
 
 		add_action( 'init', array( $this, 'init_capabilities' ) );
 		add_action( 'init', array( $this, 'install' ) );
 		add_action( 'init', array( $this, 'notice_checks' ) );
 
 		add_filter( 'plugin_action_links', array( $this, 'add_settings_link' ), 1, 2 );
-		add_action( 'plugins_loaded', array( $this, 'localize' ) );
 
 		add_action( 'ac/screen', array( $this, 'init_table_on_screen' ) );
 		add_action( 'ac/screen/quick_edit', array( $this, 'init_table_on_quick_edit' ) );
@@ -331,7 +331,9 @@ public function get_post_types() {
 	 * Load text-domain
 	 */
 	public function localize() {
-		load_plugin_textdomain( 'codepress-admin-columns', false, $this->get_dir() . '/languages/' );
+		$path = pathinfo( $this->get_dir() );
+
+		load_plugin_textdomain( 'codepress-admin-columns', false, $path['basename'] . '/languages/' );
 	}
 
 	/**

classes/Admin/Page/Columns.php

@@ -20,7 +20,13 @@ public function get_value( $user_id ) {
 	}
 
 	public function get_raw_value( $user_id ) {
-		return get_userdata( $user_id )->user_registered;
+		$user_data = get_userdata( $user_id );
+
+		if ( ! $user_data ) {
+			return null;
+		}
+
+		return $user_data->user_registered;
 	}
 
 	public function register_settings() {

classes/AdminColumns.php

@@ -199,7 +199,8 @@ private function get_where_clause( $field, $operator = null, $value = null, $boo
 		$nested = array();
 
 		if ( is_array( $field ) ) {
-			for ( $i = 0; $i < count( $field ); $i++ ) {
+			$count = count( $field );
+			for ( $i = 0; $i < $count; $i++ ) {
 				$nested[] = array_pop( $this->where );
 			}
 		}

classes/Column/User/Registered.php

@@ -31,6 +31,7 @@ public function get_dependent_settings() {
 			case 'image' :
 			case 'library_id' :
 				$settings[] = new Image( $this->column );
+				$settings[] = new MediaLink( $this->column );
 
 				break;
 			case 'excerpt' :

classes/Meta/Query.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace AC\Settings\Column;
+
+use AC;
+use AC\Settings;
+use AC\View;
+
+class MediaLink extends Settings\Column
+	implements Settings\FormatValue {
+
+	/**
+	 * @var string
+	 */
+	protected $media_link_to;
+
+	protected function define_options() {
+		return array(
+			'media_link_to' => '',
+		);
+	}
+
+	public function format( $value, $original_value ) {
+		$id = $original_value;
+
+		switch ( $this->get_media_link_to() ) {
+			case 'view' :
+			case 'download' :
+				$link = wp_get_attachment_url( $id );
+
+				break;
+			default :
+				$link = false;
+		}
+
+		if ( $link ) {
+			$attributes = array();
+
+			if ( 'download' === $this->get_media_link_to() ) {
+				$attributes['download'] = '';
+			}
+
+			$value = ac_helper()->html->link( $link, $value, $attributes );
+		}
+
+		return $value;
+	}
+
+	public function create_view() {
+		$select = $this->create_element( 'select' )->set_options( $this->get_link_options() );
+
+		$view = new View( array(
+			'label'   => __( 'Link To', 'codepress-admin-columns' ),
+			'setting' => $select,
+		) );
+
+		return $view;
+	}
+
+	protected function get_link_options() {
+		return array(
+			''         => __( 'None' ),
+			'view'     => __( 'View', 'codepress-admin-columns' ),
+			'download' => __( 'Download', 'codepress-admin-columns' ),
+		);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function get_media_link_to() {
+		return $this->media_link_to;
+	}
+
+	/**
+	 * @param string $media_link_to
+	 *
+	 * @return bool
+	 */
+	public function set_media_link_to( $media_link_to ) {
+		$this->media_link_to = $media_link_to;
+
+		return true;
+	}
+
+}

classes/Settings/Column/CustomFieldType.php

@@ -195,7 +195,7 @@ private function group_keys( $keys ) {
 
 		// Place the hidden group at the end
 		if ( isset( $grouped['_'] ) ) {
-			array_push( $grouped, $grouped['_'] );
+			$grouped[] = $grouped['_'];
 
 			unset( $grouped['_'] );
 		}

classes/Settings/Column/MediaLink.php

@@ -26,17 +26,11 @@ public function __construct( KeyValuePair $storage ) {
 	 * @return bool
 	 */
 	public function is_expired( $time = null ) {
-		$value = $this->get();
-
-		if ( false === $value ) {
-			return true;
-		}
-
 		if ( null === $time ) {
 			$time = time();
 		}
 
-		return $time > $value;
+		return $time > (int) $this->get();
 	}
 
 	/**