Permalink
Browse files

FIX: conflict after merge

  • Loading branch information...
2 parents 942ef4d + da1a570 commit 54d52bf821de1eaee9f2c5d33f8db40e074157f9 @cheh cheh committed Dec 26, 2016
Showing with 2,402 additions and 351 deletions.
  1. +2 −2 cherry-core.php
  2. +12 −1 config.json
  3. +52 −2 languages/cherry-framework.pot
  4. +11 −1 modules/cherry-breadcrumbs/cherry-breadcrumbs.php
  5. +381 −0 modules/cherry-db-updater/cherry-db-updater.php
  6. +21 −0 modules/cherry-handler/assets/js/cherry-handler.js
  7. +1 −1 modules/cherry-handler/assets/js/min/cherry-handler.min.js
  8. +13 −13 modules/cherry-handler/cherry-handler.php
  9. +2 −2 modules/cherry-interface-builder/cherry-interface-builder.php
  10. +5 −1 modules/cherry-interface-builder/inc/assets/cherry-interface-builder.js
  11. +13 −8 modules/cherry-interface-builder/inc/assets/cherry-interface-builder.scss
  12. +1 −1 modules/cherry-interface-builder/inc/assets/min/cherry-interface-builder.min.css
  13. +1 −1 modules/cherry-interface-builder/inc/assets/min/cherry-interface-builder.min.js
  14. +1 −1 modules/cherry-js-core/assets/js/min/cherry-js-core.min.js
  15. +1 −1 modules/cherry-js-core/cherry-js-core.php
  16. +0 −1 modules/cherry-post-formats-api/cherry-post-formats-api.php
  17. +1 −1 modules/cherry-post-formats-api/inc/class-cherry-facebook-embed.php
  18. +14 −5 modules/cherry-template-manager/cherry-template-manager.php
  19. +6 −29 modules/cherry-template-manager/inc/cherry-template-loader.php
  20. +2 −10 modules/cherry-template-manager/inc/cherry-template-parser.php
  21. +2 −3 modules/cherry-ui-elements/cherry-ui-elements.php
  22. +1 −1 modules/cherry-ui-elements/i-ui.php
  23. +10 −11 modules/cherry-ui-elements/inc/ui-elements/ui-button/ui-button.php
  24. +1 −1 modules/cherry-ui-elements/inc/ui-elements/ui-checkbox/assets/min/ui-checkbox.min.js
  25. +21 −18 modules/cherry-ui-elements/inc/ui-elements/ui-checkbox/ui-checkbox.php
  26. +15 −15 modules/cherry-ui-elements/inc/ui-elements/ui-colorpicker/ui-colorpicker.php
  27. +1 −1 modules/cherry-ui-elements/inc/ui-elements/ui-iconpicker/assets/min/ui-iconpicker.min.js
  28. +59 −6 modules/cherry-ui-elements/inc/ui-elements/ui-iconpicker/assets/ui-iconpicker.js
  29. +36 −14 modules/cherry-ui-elements/inc/ui-elements/ui-iconpicker/ui-iconpicker.php
  30. +1 −1 modules/cherry-ui-elements/inc/ui-elements/ui-media/assets/min/ui-media.min.js
  31. +0 −1 modules/cherry-ui-elements/inc/ui-elements/ui-media/assets/ui-media.js
  32. +9 −8 modules/cherry-ui-elements/inc/ui-elements/ui-media/ui-media.php
  33. +28 −26 modules/cherry-ui-elements/inc/ui-elements/ui-radio/ui-radio.php
  34. +9 −10 modules/cherry-ui-elements/inc/ui-elements/ui-repeater/ui-repeater.php
  35. +42 −39 modules/cherry-ui-elements/inc/ui-elements/ui-select/ui-select.php
  36. +9 −8 modules/cherry-ui-elements/inc/ui-elements/ui-slider/ui-slider.php
  37. +18 −16 modules/cherry-ui-elements/inc/ui-elements/ui-stepper/ui-stepper.php
  38. +22 −19 modules/cherry-ui-elements/inc/ui-elements/ui-switcher/ui-switcher.php
  39. +22 −19 modules/cherry-ui-elements/inc/ui-elements/ui-text/ui-text.php
  40. +17 −15 modules/cherry-ui-elements/inc/ui-elements/ui-textarea/ui-textarea.php
  41. +1 −1 modules/cherry-ui-elements/ui-element.php
  42. +1 −1 modules/cherry-utility/inc/cherry-attributes-utilit.php
  43. +34 −29 modules/cherry-utility/inc/cherry-media-utilit.php
  44. +1 −1 modules/cherry-utility/inc/cherry-meta-data-utilit.php
  45. +2 −4 modules/cherry-utility/inc/cherry-satellite-utilit.php
  46. +1 −1 modules/cherry-widget-factory/inc/class-cherry-abstract-widget.php
  47. +271 −0 modules/cherry5-insert-shortcode/assets/cherry-insert-shortcode.js
  48. +484 −0 modules/cherry5-insert-shortcode/assets/cherry-insert-shortcode.scss
  49. +1 −0 modules/cherry5-insert-shortcode/assets/min/cherry-insert-shortcode.min.css
  50. +1 −0 modules/cherry5-insert-shortcode/assets/min/cherry-insert-shortcode.min.js
  51. +266 −0 modules/cherry5-insert-shortcode/cherry5-insert-shortcode.php
  52. +71 −0 modules/cherry5-insert-shortcode/inc/class-cherry5-insertion-button.php
  53. +285 −0 modules/cherry5-insert-shortcode/inc/class-cherry5-insertion-popup.php
  54. +49 −0 modules/cherry5-insert-shortcode/inc/views/insert-shortcode-pop-up.php
  55. +23 −0 modules/cherry5-insert-shortcode/inc/views/shortcode-content-area.php
  56. +22 −0 modules/cherry5-insert-shortcode/inc/views/shortcode-has-not-option.php
  57. +25 −0 modules/cherry5-insert-shortcode/inc/views/shortcode-options.php
  58. +1 −1 setup.php
View
@@ -1,14 +1,14 @@
<?php
/**
* Class Cherry Core
- * Version: 1.3.1
+ * Version: 1.3.2
*
* @package Cherry_Framework
* @subpackage Class
* @author Cherry Team <cherryframework@gmail.com>
* @copyright Copyright (c) 2012 - 2016, Cherry Team
* @link http://www.cherryframework.com/
- * @license http://www.gnu.org/licenses/old-licenses/gpl-3.0.html
+ * @license http://www.gnu.org/licenses/gpl-3.0.en.html
*/
// If this file is called directly, abort.
View
@@ -27,6 +27,17 @@
"required" : false,
"dependencies" : []
},
+ "cherry-db-updater" : {
+ "name" : "Database Updater",
+ "description" : "Handle database updates if required.",
+ "version" : "1.0.0",
+ "doc_link" : "",
+ "git_link" : "https://github.com/CherryFramework/cherry-framework/tree/master/modules/cherry-db-updater",
+ "compatible" : ["theme", "plugin"],
+ "wordpress_org" : true,
+ "required" : false,
+ "dependencies" : []
+ },
"cherry-dynamic-css" : {
"name" : "Dynamic CSS",
"description" : "Generate CSS.",
@@ -107,7 +118,7 @@
"cherry-template-manager" : {
"name" : "Template Manager",
"description" : "Module for load and parse *.tmpl files.",
- "version" : "1.0.0",
+ "version" : "1.0.1",
"doc_link" : "",
"git_link" : "https://github.com/CherryFramework/cherry-framework/tree/master/modules/cherry-template-manager",
"compatible" : ["theme", "plugin"],
@@ -2,8 +2,8 @@
msgid ""
msgstr ""
"Project-Id-Version: cherry-framework\n"
-"POT-Creation-Date: 2016-11-28 19:44+0200\n"
-"PO-Revision-Date: 2016-02-15 11:18+0200\n"
+"POT-Creation-Date: 2016-12-26 14:10+0200\n"
+"PO-Revision-Date: 2016-12-09 16:29+0200\n"
"Last-Translator: \n"
"Language-Team: TemplateMonster\n"
"Language: en\n"
@@ -67,3 +67,53 @@ msgstr ""
#: modules/cherry-customizer/cherry-customizer.php:338
msgid "Untitled Control"
msgstr ""
+
+#: modules/cherry-db-updater/cherry-db-updater.php:105
+#, php-format
+msgid ""
+"Module DB Updater init error in %s - version and slug is required arguments"
+msgstr ""
+
+#: modules/cherry-db-updater/cherry-db-updater.php:106
+msgid "We need to update your database to the latest version."
+msgstr ""
+
+#: modules/cherry-db-updater/cherry-db-updater.php:107
+msgid "Update complete, thank you for updating to the latest version!"
+msgstr ""
+
+#: modules/cherry-db-updater/cherry-db-updater.php:331
+msgid "Start Update"
+msgstr ""
+
+#: modules/cherry-db-updater/cherry-db-updater.php:368
+msgid "Data Update"
+msgstr ""
+
+#: modules/cherry5-insert-shortcode/inc/class-cherry5-insertion-button.php:63
+msgid "Cherry shortcodes"
+msgstr ""
+
+#: modules/cherry5-insert-shortcode/inc/class-cherry5-insertion-popup.php:128
+msgid "insert shortcode"
+msgstr ""
+
+#: modules/cherry5-insert-shortcode/inc/class-cherry5-insertion-popup.php:148
+msgid "Shortcode List"
+msgstr ""
+
+#: modules/cherry5-insert-shortcode/inc/class-cherry5-insertion-popup.php:206
+msgid "Shortcode not found."
+msgstr ""
+
+#: modules/cherry5-insert-shortcode/inc/class-cherry5-insertion-popup.php:261
+msgid "Shortcode content."
+msgstr ""
+
+#: modules/cherry5-insert-shortcode/inc/class-cherry5-insertion-popup.php:262
+msgid "Input shortcode content."
+msgstr ""
+
+#: modules/cherry5-insert-shortcode/inc/class-cherry5-insertion-popup.php:277
+msgid "Shortcode not a have options."
+msgstr ""
@@ -1446,7 +1446,17 @@ function _process_single_tag( $tag, $post_id ) {
if ( $terms ) {
/* Sort the terms by ID and get the first category. */
- usort( $terms, '_usort_terms_by_ID' );
+ if ( function_exists( 'wp_list_sort' ) ) {
+ $terms = wp_list_sort( $terms, array(
+ 'term_id' => 'ASC',
+ ) );
+
+ } else {
+
+ // Backward compatibility with WordPress 4.6 or later.
+ usort( $terms, '_usort_terms_by_ID' );
+ }
+
$term = get_term( $terms[0], 'category' );
/* If the category has a parent, add the hierarchy to the trail. */
Oops, something went wrong.

0 comments on commit 54d52bf

Please sign in to comment.