Skip to content

Commit

Permalink
Merge branch 'alim-dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
priyomukul committed Mar 28, 2022
2 parents 064af0e + 0f45dfd commit b71bca6
Show file tree
Hide file tree
Showing 12 changed files with 30 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .distignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
.gitlab-ci.yml
.travis.yml
.DS_Store
.wordpress-org
Thumbs.db
behat.yml
bin
Expand All @@ -34,4 +35,4 @@ node_modules
src
assets/img/card
*.map
assets/scss
assets/scss
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
.gitlab-ci.yml export-ignore
.travis.yml export-ignore
.DS_Store export-ignore
.wordpress-org export-ignore
Thumbs.db export-ignore
behat.yml export-ignore
bin export-ignore
Expand All @@ -34,4 +35,4 @@ node_modules export-ignore
src export-ignore
assets/img/card export-ignore
*.map export-ignore
assets/scss export-ignore
assets/scss export-ignore
17 changes: 17 additions & 0 deletions .github/workflows/trunk.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Assets Update to WordPress.org

on:
push:
branches: [ trunk ]

jobs:
assets:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Assets Update
id: assets
uses: 10up/action-wordpress-plugin-asset-update@stable
env:
SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
SVN_USERNAME: ${{ secrets.SVN_USERNAME }}
Binary file added .wordpress-org/banner-1544x500.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/banner-772x250.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/icon-128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/icon-256x256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .wordpress-org/screenshot-3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions disable-comments.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Plugin Name: Disable Comments
* Plugin URI: https://wordpress.org/plugins/disable-comments/
* Description: Allows administrators to globally disable comments on their site. Comments can be disabled according to post type. You could bulk delete comments using Tools.
* Version: 2.3.3
* Version: 2.3.4
* Author: WPDeveloper
* Author URI: https://wpdeveloper.com
* License: GPL-3.0+
Expand Down Expand Up @@ -37,7 +37,7 @@ public static function get_instance()

function __construct()
{
define('DC_VERSION', '2.3.3');
define('DC_VERSION', '2.3.4');
define('DC_PLUGIN_SLUG', 'disable_comments_settings');
define('DC_PLUGIN_ROOT_PATH', dirname(__FILE__));
define('DC_PLUGIN_VIEWS_PATH', DC_PLUGIN_ROOT_PATH . '/views/');
Expand Down Expand Up @@ -111,7 +111,7 @@ function __construct()
}

public function is_network_admin(){
if (is_network_admin() || defined('DOING_AJAX') && DOING_AJAX && is_multisite() && preg_match('#^'.network_admin_url().'#i',$_SERVER['HTTP_REFERER'])) {
if (is_network_admin() || isset($_SERVER['HTTP_REFERER']) && defined('DOING_AJAX') && DOING_AJAX && is_multisite() && preg_match('#^'.network_admin_url().'#i',$_SERVER['HTTP_REFERER'])) {
return true;
}
return false;
Expand Down
8 changes: 6 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Tags: comments, delete comments, disable comments, spam comment, disable, stop s
Requires at least: 5.0
Tested up to: 5.9
Requires PHP: 5.6
Stable tag: 2.3.3
Stable tag: 2.3.4
License: GPL-3.0-or-later
License URI: https://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -123,7 +123,7 @@ Consider checking out our other WordPress solutions & boost your WordPress websi

📄 [EmbedPress](https://wordpress.org/plugins/embedpress/): EmbedPress lets you embed anything including videos, images, posts, audio, maps and upload PDF, DOC, PPT etc.

☁ [Templately](https://wordpress.org/plugins/templately/): 1000+ Free templates library for Elementor & Gutenberg along with the cloud collaboration for WordPress.
☁ [Templately](https://wordpress.org/plugins/templately/): 1200+ Free templates library for Elementor & Gutenberg along with the cloud collaboration for WordPress.

📚 [BetterDocs](https://wordpress.org/plugins/betterdocs/): Best Documentation & Knowledge Base Plugin for WordPress reduce manual support tickets & improve user experience.

Expand Down Expand Up @@ -183,6 +183,7 @@ Go to the tools page for the Disable Comments plugin and utlize the Delete Comme

1. Setting Screen for Disable Comments
2. Delete Comments under Tools menu.
3. Multisite Network support


== Changelog ==
Expand All @@ -191,6 +192,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
This will be maiintained from August 19, 2020 - @asif2bd

= [2.3.4] - 2022-03-28 =
* Fixed: PHP Warning in Multisite Network.

= [2.3.3] - 2022-01-25 =
* Added: WordPress 5.9 compatibility added.

Expand Down

0 comments on commit b71bca6

Please sign in to comment.