Skip to content

Commit

Permalink
FIX: conflicts after merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@cheh
cheh committed May 27, 2016
2 parents 9421313 + 614e986 commit 3801040
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 15 deletions.
4 changes: 2 additions & 2 deletions lib/admin/ui-elements/ui-ace-editor/ui-ace-editor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ public function render() {
}
$html .= '<div class="ace-editor-wrapper ' . $this->settings['class'] . '">';
$html .= '<textarea id="' . $this->settings['id'] . '-textarea" class="ace-editor" name="' . $this->settings['name'] . '" data-editor="' . $this->settings['id'] . '-editor" data-editor-mode="css" data-editor-theme="monokai">';
$html .= $this->settings['value'];
$html .= stripslashes( $this->settings['value'] );
$html .= '</textarea>';
$html .= '<pre id="' . $this->settings['id'] . '-editor" class="ace-editor-area">';
$html .= htmlspecialchars( $this->settings['value'] );
$html .= stripslashes( $this->settings['value'] );
$html .= '</pre>';
$html .= '</div>';

Expand Down
8 changes: 4 additions & 4 deletions lib/admin/ui-elements/ui-repeater/ui-repeater.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@ public function render() {
$html .= '<div class="cherry-repeater-item-list">';
$html .= '<div class="cherry-repeater-dublicate-item">';
$html .= '<div class="col">';
$html .= '<input class="' . $this->settings['class'] . 'external-link" name="" type="text" placeholder="' . __( 'External link', 'cherry' ) . '" value="">';
$html .= '<input class="' . $this->settings['class'] . 'external-link" name="' . $this->settings['name'] . '" type="text" placeholder="' . __( 'External link', 'cherry' ) . '" value="">';
$html .= '</div>';
$html .= '<div class="col">';
$html .= '<input class="' . $this->settings['class'] . 'font-class" name="" type="text" placeholder="' . __( 'Font class', 'cherry' ) . '" value="">';
$html .= '<input class="' . $this->settings['class'] . 'font-class" name="' . $this->settings['name'] . '" type="text" placeholder="' . __( 'Font class', 'cherry' ) . '" value="">';
$html .= '</div>';
$html .= '<div class="col">';
$html .= '<input class="' . $this->settings['class'] . 'link-label" name="" type="text" placeholder="' . __( 'Link label', 'cherry' ) . '" value="">';
$html .= '<input class="' . $this->settings['class'] . 'link-label" name="' . $this->settings['name'] . '" type="text" placeholder="' . __( 'Link label', 'cherry' ) . '" value="">';
$html .= '</div>';
$html .= '<input class="' . $this->settings['class'] . 'network-id" name="" type="hidden" value="">';
$html .= '<input class="' . $this->settings['class'] . 'network-id" name="' . $this->settings['name'] . '" type="hidden" value="">';

$html .= '<div class="repeater-delete-button-holder"><a class="repeater-delete-button" href="javascript:void(0);"><i class="dashicons dashicons-trash"></i></a></div>';
$html .= '</div>';
Expand Down
2 changes: 1 addition & 1 deletion lib/classes/class-cherry-css-compiler.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ function prepare_dynamic_css() {

$data = ob_get_clean();

$user_css = cherry_get_option( 'general-user-css' );
$user_css = apply_filters( 'cherry_dynamic_user_css', html_entity_decode( wp_unslash( (string) cherry_get_option( 'general-user-css' ) ) ) );

if ( $user_css ) {
$data .= $user_css;
Expand Down
7 changes: 0 additions & 7 deletions lib/classes/class-cherry-optionsframework.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,13 +226,6 @@ public function create_updated_options( $post_array ) {
$options[$section_name]['options-list'][$key] = $check_value;
}
break;
case 'repeater':
if ( isset( $post_array[ $key ] ) ) {
$options[$section_name]['options-list'][$key] = $post_array[$key];
}else{
$options[$section_name]['options-list'][$key] = array();
}
break;
default:
if (isset($post_array[$key])) {
$options[$section_name]['options-list'][$key] = $post_array[$key];
Expand Down
4 changes: 4 additions & 0 deletions lib/functions/filters.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@
// Add mobile menu trigger to `Primary` nav menu.
add_filter( 'wp_nav_menu', 'cherry_add_mobile_menu_trigger', 10, 2 );

// Removed a live chats.
remove_filter( 'after_setup_theme', array( 'Cherry_Live_Chat_Class', 'get_instance' ), 11 );
remove_filter( 'after_setup_theme', array( 'Monstroid_Live_Chat_Class', 'get_instance' ), 11 );


function cherry_add_body_control_classes( $classes, $class ) {

Expand Down
2 changes: 1 addition & 1 deletion style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Theme URI: http://www.cherryframework.com/
Author: Cherry Team
Author URI: http://www.cherryframework.com/
Description: Cherry Framework parent theme based on _s started theme for WordPress with enhanced functionality and extended possibilities.
Version: 4.0.5.4-beta
Version: 4.0.5.4
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Tags: fixed-layout, fluid-layout, responsive-layout, left-sidebar, right-sidebar, custom-menu, featured-images, full-width-template, post-formats, sticky-post, theme-options, translation-ready
Expand Down

0 comments on commit 3801040

Please sign in to comment.