Skip to content

Commit

Permalink
Merge branch 'master' into trunk
Browse files Browse the repository at this point in the history 
Conflicts:
	init.php
  • Loading branch information
@jtsternberg
jtsternberg committed Oct 1, 2015
2 parents 7b66c3a + b3b78a5 commit cf45257
Show file tree
Hide file tree
Showing 240 changed files with 6,573 additions and 6,066 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.

## [Unreleased][unreleased]

## 2.1.2 - 2015-10-01

### Bug Fixes

* Fixes back-compatibility issue when adding fields array to the metabox registration. ([#472](https://github.com/WebDevStudios/CMB2/pull/472))

## 2.1.1 - 2015-09-30

### Enhancements
Expand Down
10 changes: 8 additions & 2 deletions includes/CMB2.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -838,12 +838,18 @@ public function get_field_args( $field_id, $field_args, $sub_field_id, $field_gr
protected function add_fields( $fields, $parent_field_id = null ) {
foreach ( $fields as $field ) {

$sub_fields = false;
if ( array_key_exists( 'fields', $field ) ) {
$sub_fields = $field['fields'];
unset( $field['fields'] );
}

$field_id = $parent_field_id
? $this->add_group_field( $parent_field_id, $field )
: $this->add_field( $field );

if ( array_key_exists( 'fields', $field ) ) {
$this->add_fields( $field['fields'], $field_id );
if ( $sub_fields ) {
$this->add_fields( $sub_fields, $field_id );
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions init.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* Bill Erickson (@billerickson / billerickson.net)
* Andrew Norcross (@norcross / andrewnorcross.com)
*
* Version: 2.1.1
* Version: 2.1.2
*
* Text Domain: cmb2
* Domain Path: languages
Expand Down Expand Up @@ -48,7 +48,7 @@
or things might explode!
*************************************************************************/

if ( ! class_exists( 'CMB2_Bootstrap_211_Trunk', false ) ) {
if ( ! class_exists( 'CMB2_Bootstrap_212', false ) ) {

/**
* Handles checking for and loading the newest version of CMB2
Expand All @@ -61,14 +61,14 @@
* @license GPL-2.0+
* @link http://webdevstudios.com
*/
class CMB2_Bootstrap_211_Trunk {
class CMB2_Bootstrap_212 {

/**
* Current version number
* @var string
* @since 1.0.0
*/
const VERSION = '2.1.1';
const VERSION = '2.1.2';

/**
* Current version hook priority.
Expand All @@ -80,17 +80,17 @@ class CMB2_Bootstrap_211_Trunk {
const PRIORITY = 9987;

/**
* Single instance of the CMB2_Bootstrap_211_Trunk object
* Single instance of the CMB2_Bootstrap_212 object
*
* @var CMB2_Bootstrap_211_Trunk
* @var CMB2_Bootstrap_212
*/
public static $single_instance = null;

/**
* Creates/returns the single instance CMB2_Bootstrap_211_Trunk object
* Creates/returns the single instance CMB2_Bootstrap_212 object
*
* @since 2.0.0
* @return CMB2_Bootstrap_211_Trunk Single instance object
* @return CMB2_Bootstrap_212 Single instance object
*/
public static function initiate() {
if ( null === self::$single_instance ) {
Expand Down Expand Up @@ -177,6 +177,6 @@ public function l10ni18n() {
}

// Make it so...
CMB2_Bootstrap_211_Trunk::initiate();
CMB2_Bootstrap_212::initiate();

}
Binary file modified languages/cmb2-ach.mo
View file
Binary file not shown.
106 changes: 55 additions & 51 deletions languages/cmb2-ach.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ msgid ""
msgstr ""
"Project-Id-Version: CMB2\n"
"Report-Msgid-Bugs-To: http://wordpress.org/support/plugin/cmb2\n"
"POT-Creation-Date: 2015-06-02 16:12:19+00:00\n"
"PO-Revision-Date: 2015-06-02 15:55+0000\n"
"Last-Translator: FxB <[email protected]>\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/cmb2/language/ach/)\n"
"POT-Creation-Date: 2015-07-29 15:52:03+00:00\n"
"PO-Revision-Date: 2015-07-29 06:08+0000\n"
"Last-Translator: FX Bénard <[email protected]>\n"
"Language-Team: Acoli (http://www.transifex.com/wp-translations/cmb2/language/ach/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand All @@ -23,7 +23,7 @@ msgstr ""
"X-Poedit-SourceCharset: UTF-8\n"
"X-Textdomain-Support: yes\n"

#: example-functions.php:82 tests/test-cmb-field.php:206
#: example-functions.php:82 tests/test-cmb-field.php:228
msgid "Test Metabox"
msgstr ""

Expand All @@ -43,11 +43,11 @@ msgstr ""
#: example-functions.php:277 example-functions.php:285
#: example-functions.php:294 example-functions.php:301
#: example-functions.php:315 example-functions.php:381
#: example-functions.php:475 example-functions.php:483
#: example-functions.php:490 example-functions.php:497
#: example-functions.php:504 example-functions.php:511
#: example-functions.php:518 example-functions.php:556
#: tests/test-cmb-field.php:218
#: example-functions.php:476 example-functions.php:484
#: example-functions.php:491 example-functions.php:498
#: example-functions.php:505 example-functions.php:512
#: example-functions.php:519 example-functions.php:557
#: tests/test-cmb-field.php:240
msgid "field description (optional)"
msgstr ""

Expand Down Expand Up @@ -158,19 +158,19 @@ msgstr ""
msgid "Test Checkbox"
msgstr ""

#: example-functions.php:300 tests/test-cmb-field.php:217
#: example-functions.php:300 tests/test-cmb-field.php:239
msgid "Test Multi Checkbox"
msgstr ""

#: example-functions.php:306 tests/test-cmb-field.php:223
#: example-functions.php:306 tests/test-cmb-field.php:245
msgid "Check One"
msgstr ""

#: example-functions.php:307 tests/test-cmb-field.php:224
#: example-functions.php:307 tests/test-cmb-field.php:246
msgid "Check Two"
msgstr ""

#: example-functions.php:308 tests/test-cmb-field.php:225
#: example-functions.php:308 tests/test-cmb-field.php:247
msgid "Check Three"
msgstr ""

Expand Down Expand Up @@ -228,63 +228,63 @@ msgstr ""
msgid "Remove Entry"
msgstr ""

#: example-functions.php:426
#: example-functions.php:427
msgid "Entry Title"
msgstr ""

#: example-functions.php:433
#: example-functions.php:434
msgid "Description"
msgstr ""

#: example-functions.php:434
#: example-functions.php:435
msgid "Write a short description for this entry"
msgstr ""

#: example-functions.php:440
#: example-functions.php:441
msgid "Entry Image"
msgstr ""

#: example-functions.php:446
#: example-functions.php:447
msgid "Image Caption"
msgstr ""

#: example-functions.php:467
#: example-functions.php:468
msgid "User Profile Metabox"
msgstr ""

#: example-functions.php:474
#: example-functions.php:475
msgid "Extra Info"
msgstr ""

#: example-functions.php:482
#: example-functions.php:483
msgid "Avatar"
msgstr ""

#: example-functions.php:489
#: example-functions.php:490
msgid "Facebook URL"
msgstr ""

#: example-functions.php:496
#: example-functions.php:497
msgid "Twitter URL"
msgstr ""

#: example-functions.php:503
#: example-functions.php:504
msgid "Google+ URL"
msgstr ""

#: example-functions.php:510
#: example-functions.php:511
msgid "Linkedin URL"
msgstr ""

#: example-functions.php:517
#: example-functions.php:518
msgid "User Field"
msgstr ""

#: example-functions.php:540
#: example-functions.php:541
msgid "Theme Options Metabox"
msgstr ""

#: example-functions.php:555
#: example-functions.php:556
msgid "Site Background Color"
msgstr ""

Expand All @@ -300,24 +300,24 @@ msgstr ""
msgid "Please Try Again"
msgstr ""

#: includes/CMB2_Ajax.php:135 tests/test-cmb-types.php:786
#: includes/CMB2_Ajax.php:135 tests/test-cmb-types.php:785
msgid "Remove Embed"
msgstr ""

#: includes/CMB2_Ajax.php:139 tests/test-cmb-types.php:787
#: includes/CMB2_Ajax.php:139 tests/test-cmb-types.php:786
msgid "No oEmbed Results Found for %s. View more info at"
msgstr ""

#: includes/CMB2_Field.php:891
#: includes/CMB2_Field.php:910
msgid "Add Group"
msgstr ""

#: includes/CMB2_Field.php:892
#: includes/CMB2_Field.php:911
msgid "Remove Group"
msgstr ""

#: includes/CMB2_Field.php:914 includes/CMB2_Field.php:918
#: tests/test-cmb-field.php:178
#: includes/CMB2_Field.php:933 includes/CMB2_Field.php:937
#: tests/test-cmb-field.php:200
msgid "None"
msgstr ""

Expand Down Expand Up @@ -403,46 +403,50 @@ msgstr ""
msgid "Use this file"
msgstr ""

#: includes/CMB2_JS.php:136 includes/CMB2_Types.php:983
#: includes/CMB2_JS.php:136
msgid "Use these files"
msgstr ""

#: includes/CMB2_JS.php:137 includes/CMB2_Types.php:996
msgid "Remove Image"
msgstr ""

#: includes/CMB2_JS.php:137 includes/CMB2_Types.php:356
#: includes/CMB2_Types.php:1002 tests/test-cmb-types.php:155
#: tests/test-cmb-types.php:163 tests/test-cmb-types.php:735
#: tests/test-cmb-types.php:760
#: includes/CMB2_JS.php:138 includes/CMB2_Types.php:357
#: includes/CMB2_Types.php:1015 tests/test-cmb-types.php:155
#: tests/test-cmb-types.php:163 tests/test-cmb-types.php:734
#: tests/test-cmb-types.php:759
msgid "Remove"
msgstr ""

#: includes/CMB2_JS.php:138 includes/CMB2_Types.php:997
#: tests/test-cmb-types.php:736 tests/test-cmb-types.php:761
#: includes/CMB2_JS.php:139 includes/CMB2_Types.php:1010
#: tests/test-cmb-types.php:735 tests/test-cmb-types.php:760
msgid "File:"
msgstr ""

#: includes/CMB2_JS.php:139 includes/CMB2_Types.php:1000
#: tests/test-cmb-types.php:734 tests/test-cmb-types.php:759
#: includes/CMB2_JS.php:140 includes/CMB2_Types.php:1013
#: tests/test-cmb-types.php:733 tests/test-cmb-types.php:758
msgid "Download"
msgstr ""

#: includes/CMB2_JS.php:140
#: includes/CMB2_JS.php:141
msgid "Select / Deselect All"
msgstr ""

#: includes/CMB2_Types.php:297
#: includes/CMB2_Types.php:298
msgid "Add Row"
msgstr ""

#: includes/CMB2_Types.php:734 includes/CMB2_Types.php:782
#: includes/CMB2_Types.php:741 includes/CMB2_Types.php:789
msgid "No terms"
msgstr ""

#: includes/CMB2_Types.php:847 tests/test-cmb-types.php:711
#: tests/test-cmb-types.php:737
#: includes/CMB2_Types.php:856 tests/test-cmb-types.php:710
#: tests/test-cmb-types.php:736
msgid "Add or Upload Files"
msgstr ""

#: includes/CMB2_Types.php:907 tests/test-cmb-types.php:747
#: tests/test-cmb-types.php:762
#: includes/CMB2_Types.php:918 tests/test-cmb-types.php:746
#: tests/test-cmb-types.php:761
msgid "Add or Upload File"
msgstr ""

Expand Down
Binary file modified languages/cmb2-af.mo
View file
Binary file not shown.
Loading

0 comments on commit cf45257

Please sign in to comment.