Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies and tag for 5.2 compatibility #28

Merged
merged 5 commits into from
Jul 29, 2019
Merged

Update dependencies and tag for 5.2 compatibility #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f6bd214
Update package.json version, composer.json
Jul 22, 2019
1855ad1
Fix some function defenitions for PHP 7
Jul 22, 2019
1d0fd84
Fix some output for php 5.6
Jul 22, 2019
6a7223b
bump for 5.2
Jul 22, 2019
06a710c
Merge branch 'develop' into feature/updates-for-5-2
helen Jul 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ phpunit.xml
.sass-cache
*.map
release
vendor
.DS_Store
28 changes: 14 additions & 14 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module.exports = function( grunt ) {
'Gruntfile.js',
'assets/js/src/**/*.js',
'assets/js/test/**/*.js'
]
]
},
uglify: {
all: {
Expand All @@ -28,42 +28,42 @@ module.exports = function( grunt ) {
},
options: {
mangle: {
except: ['jQuery']
reserved: ['jQuery']
}
}
}
},

sass: {
all: {
files: {
'assets/css/style.css': 'assets/css/sass/style.scss'
}
}
},


autoprefixer: {
dist: {
options: {
browsers: [ 'last 1 version', '> 1%', 'ie 8' ]
},
files: {
files: {
'assets/css/style.css': [ 'assets/css/style.css' ]
}
}
},

cssmin: {
options: {
processImport: false
},
minify: {
expand: true,
cwd: 'assets/css/',

cwd: 'assets/css/',
src: ['style.css'],

dest: 'assets/css/',
ext: '.min.css'
}
Expand Down Expand Up @@ -121,7 +121,7 @@ module.exports = function( grunt ) {
'!phpunit.xml.dist'
],
dest: './release/<%= pkg.version %>/'
}
}
},
compress: {
main: {
Expand All @@ -133,7 +133,7 @@ module.exports = function( grunt ) {
cwd: './release/<%= pkg.version %>/',
src: ['**/*'],
dest: 'eight-day-week/'
}
}
},
wp_readme_to_markdown: {
target: {
Expand All @@ -143,10 +143,10 @@ module.exports = function( grunt ) {
}
}
} );

// Load tasks
require('load-grunt-tasks')(grunt);

// Register tasks
grunt.registerTask( 'default', ['jshint', 'concat', 'uglify', 'sass', 'autoprefixer', 'cssmin' ] );

Expand Down
2 changes: 1 addition & 1 deletion assets/css/style.min.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion assets/js/scripts.min.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"license": "GPLv2.0+",
"authors": [
{
"name": "10up, Josh Levinson, Brent Schultz",
"email": "josh.levinson@10up.com",
"name": "10up",
"email": "plugins@10up.com",
"homepage": "http://10up.com",
"role": "Developer"
}
Expand All @@ -19,7 +19,7 @@
"php": ">=5.4"
},
"require-dev": {
"antecedent/patchwork": "1.2.*",
"antecedent/patchwork": "2.1.*",
"phpunit/phpunit": "*@stable",
"brianium/paratest": "dev-master",
"10up/wp_mock": "dev-master"
Expand Down
4 changes: 2 additions & 2 deletions includes/functions/articles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ function display_tablenav( $which ) {
*
* @return string
*/
function _column_title( $item, $classes, $data, $primary ) {
function _column_title( $item, $classes = '', $data = '', $primary = false ) {
$html = '<td class="' . esc_attr( $classes ) . ' page-title" ' . esc_attr( $data ) . '>';
$html .= $this->column_title( $item );
$html .= '</td>';
Expand Down Expand Up @@ -458,7 +458,7 @@ function get_articles( $title ) {
*
* @return string Modified WHERE SQL clause
*/
function title_filter( $where, &$wp_query ) {
function title_filter( $where, $wp_query ) {
global $wpdb;
if ( $title = $wp_query->get( 'search_by_title' ) ) {
/*using the esc_like() in here instead of other esc_sql()*/
Expand Down
2 changes: 1 addition & 1 deletion includes/functions/plugins/issue-status.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ function add_issue_status_filters() {
echo '<select name="' . esc_attr( $tax_slug ) . '" id="' . esc_attr( $tax_slug ) . '" class="postform">';
echo '<option value="">' . sprintf( esc_html_x( 'Show All %s', 'Select option for filtering all issue statuses', 'eight-day-week' ) , esc_html( $tax_name ) ) . '</option>';
foreach ( $terms as $term ) {
echo '<option value="' . esc_attr( $term->slug ) . '"' . selected( $_GET[ $tax_slug ], $term->slug ) . '>' . esc_html( $term->name ) . '</option>';
echo '<option value="' . esc_attr( $term->slug ) . '"' . selected( isset( $_GET[ $tax_slug ] ) ? $_GET[ $tax_slug ] : '', $term->slug ) . '>' . esc_html( $term->name ) . '</option>';
}
echo '</select>';
}
Expand Down
Loading