Skip to content

Commit

Permalink
Merge pull request #97 from Getbeans/release/1.4.1
Browse files Browse the repository at this point in the history
Release 1.4.1
  • Loading branch information
Thierry Muller authored Jan 10, 2018
2 parents 6308409 + cb24949 commit 8faa874
Show file tree
Hide file tree
Showing 10 changed files with 732 additions and 22 deletions.
6 changes: 3 additions & 3 deletions lib/admin/wp-customize.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ function beans_do_register_wp_customize_options() {

$fields = array(
array(
'id' => 'beans_logo_image',
'label' => __( 'Logo Image', 'tm-beans' ),
'type' => 'WP_Customize_Image_Control',
'id' => 'beans_logo_image',
'label' => __( 'Logo Image', 'tm-beans' ),
'type' => 'WP_Customize_Image_Control',
),
);

Expand Down
13 changes: 6 additions & 7 deletions lib/api/compiler/class-page-compiler.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,16 @@ public function compile_page_scripts() {
*/
private function compile_enqueued( $type, $depedencies = false ) {

$set_global = 'wp_' . $type . 's';
$set_dequeued_global = 'beans_dequeue_' . $type . 's';

global $$set_global;
if ( ! $assets = beans_get( "wp_{$type}s", $GLOBALS ) ) {
return array();
}

if ( 'script' == $type ) {
add_action( 'wp_print_scripts', array( $this, 'dequeue_scripts' ), 9999 );
}

if ( ! $depedencies ) {
$depedencies = $$set_global->queue;
$depedencies = $assets->queue;
}

$fragments = array();
Expand All @@ -87,7 +86,7 @@ private function compile_enqueued( $type, $depedencies = false ) {
continue;
}

if ( ! $args = beans_get( $id, $$set_global->registered ) ) {
if ( ! $args = beans_get( $id, $assets->registered ) ) {
continue;
}

Expand All @@ -108,7 +107,7 @@ private function compile_enqueued( $type, $depedencies = false ) {
$args->src = add_query_arg( array( 'beans_compiler_media_query' => $args->args ), $args->src );
}

$$set_global->done[] = $id;
$assets->done[] = $id;

} elseif ( 'script' == $type ) {

Expand Down
16 changes: 12 additions & 4 deletions lib/api/html/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ function beans_output( $id, $output ) {
*/
function beans_output_e( $id, $output ) {

echo call_user_func_array( 'beans_output', func_get_args() );
$args = func_get_args();

echo call_user_func_array( 'beans_output', $args );

}

Expand Down Expand Up @@ -185,7 +187,9 @@ function beans_open_markup( $id, $tag, $attributes = array() ) {
*/
function beans_open_markup_e( $id, $tag, $attributes = array() ) {

echo call_user_func_array( 'beans_open_markup', func_get_args() );
$args = func_get_args();

echo call_user_func_array( 'beans_open_markup', $args );

}

Expand Down Expand Up @@ -244,7 +248,9 @@ function beans_selfclose_markup( $id, $tag, $attributes = array() ) {
*/
function beans_selfclose_markup_e( $id, $tag, $attributes = array() ) {

echo call_user_func_array( 'beans_selfclose_markup', func_get_args() );
$args = func_get_args();

echo call_user_func_array( 'beans_selfclose_markup', $args );

}

Expand Down Expand Up @@ -307,7 +313,9 @@ function beans_close_markup( $id, $tag ) {
*/
function beans_close_markup_e( $id, $tag ) {

echo call_user_func_array( 'beans_close_markup', func_get_args() );
$args = func_get_args();

echo call_user_func_array( 'beans_close_markup', $args );

}

Expand Down
2 changes: 1 addition & 1 deletion lib/api/post-meta/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* @param string $field_id The post meta id searched.
* @param mixed $default Optional. The default value to return of the post meta value doesn't exist.
* @param int $term_id Optional. Overwrite the current post id.
* @param int $post_id Optional. Overwrite the current post id.
*
* @return mixed Saved data if exist, otherwise default value set.
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/api/term-meta/class.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public function fields( $tag ) {
foreach ( beans_get_fields( 'term_meta', $this->section ) as $field ) {

?>
<tr class="form-field">';
<tr class="form-field">
<th scope="row">
<?php echo beans_field_label( $field ); ?>
</th>
Expand Down
6 changes: 3 additions & 3 deletions lib/api/uikit/functions.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* The Beans UIkit component integrates the awesome {@link http://getuikit.com UIkit framework}.
* The Beans UIkit component integrates the awesome {@link https://getuikit.com/v2/ UIkit 2 framework}.
*
* Only the desired components are compiled into a single cached file and may be different on a per page basis. UIkit
* default or custom themes can be enqueued to the UIkit compiler. All UIkit LESS variables are accessible
Expand All @@ -16,7 +16,7 @@
* Enqueue UIkit components.
*
* Enqueued components will be compiled into a single file. Refer to
* {@link http://http://getuikit.com/ UIkit} to learn more about the available components.
* {@link https://getuikit.com/v2/ UIkit 2} to learn more about the available components.
*
* When development mode is enabled, files changes will automatically be detected. This makes it very easy
* to style UIkit themes using LESS.
Expand Down Expand Up @@ -60,7 +60,7 @@ function beans_uikit_enqueue_components( $components, $type = 'core', $autoload
* Dequeue UIkit components.
*
* Dequeued components are removed from the UIkit compiler. Refer to
* {@link http://http://getuikit.com/ UIkit} to learn more about the available components.
* {@link https://getuikit.com/v2/ UIkit 2} to learn more about the available components.
*
* When development mode is enabled, files changes will automatically be detected. This makes it very easy
* to style UIkit themes using LESS.
Expand Down
2 changes: 1 addition & 1 deletion lib/init.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
function beans_define_constants() {

// Define version.
define( 'BEANS_VERSION', '1.4.0' );
define( 'BEANS_VERSION', '1.4.1' );

// Define paths.
if ( ! defined( 'BEANS_THEME_PATH' ) ) {
Expand Down
2 changes: 1 addition & 1 deletion lib/templates/fragments/post.php
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ function beans_previous_post_link( $output, $format, $link, $post ) {

$output = beans_open_markup( 'beans_previous_link[_post_navigation]', 'a', array(
'href' => get_permalink( $post ), // Automatically escaped.
'ref' => 'previous',
'rel' => 'previous',
'title' => $post->post_title, // Automatically escaped.
) );

Expand Down
Loading

0 comments on commit 8faa874

Please sign in to comment.