Skip to content
Snippets Groups Projects
Commit b33b81de authored by lucha's avatar lucha
Browse files

composer update: core 5.4.2, disable-updates 1.6.6

parent 9d034cb4
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
composer.lock
+ 42
− 44
View file @ b33b81de
{
"_readme": [
"This file locks the dependencies of your project to a known state",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "e7d9006f3ea383c37020ea371d52dd64",
......@@ -170,6 +170,16 @@
"zend",
"zikula"
],
"funding": [
{
"url": "https://packagist.com",
"type": "custom"
},
{
"url": "https://tidelift.com/funding/github/packagist/composer/composer",
"type": "tidelift"
}
],
"time": "2020-04-07T06:57:05+00:00"
},
{
......@@ -218,27 +228,24 @@
},
{
"name": "johnpbloch/wordpress",
"version": "5.4.1",
"version": "5.4.2",
"source": {
"type": "git",
"url": "https://github.com/johnpbloch/wordpress.git",
"reference": "2cdacd2a14c9960bcd86d8b4d7b1f211b3e77684"
"reference": "18c41a328193d6f7425a3cea4e01faa220e90218"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/johnpbloch/wordpress/zipball/2cdacd2a14c9960bcd86d8b4d7b1f211b3e77684",
"reference": "2cdacd2a14c9960bcd86d8b4d7b1f211b3e77684",
"url": "https://api.github.com/repos/johnpbloch/wordpress/zipball/18c41a328193d6f7425a3cea4e01faa220e90218",
"reference": "18c41a328193d6f7425a3cea4e01faa220e90218",
"shasum": ""
},
"require": {
"johnpbloch/wordpress-core": "5.4.1",
"johnpbloch/wordpress-core-installer": "^1.0",
"johnpbloch/wordpress-core": "5.4.2",
"johnpbloch/wordpress-core-installer": "^1.0 || ^2.0",
"php": ">=5.6.20"
},
"type": "package",
"extra": {
"patches_applied": []
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
......@@ -256,27 +263,28 @@
"cms",
"wordpress"
],
"time": "2020-04-29T19:02:59+00:00"
"time": "2020-06-10T22:05:43+00:00"
},
{
"name": "johnpbloch/wordpress-core",
"version": "5.4.1",
"version": "5.4.2",
"source": {
"type": "git",
"url": "https://github.com/johnpbloch/wordpress-core.git",
"reference": "4639993365dbb3c935d420df22f84c136d9ef4d1"
"reference": "3e67d8b6ee6c11e8ce404da4627117fb7fbf9266"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/johnpbloch/wordpress-core/zipball/4639993365dbb3c935d420df22f84c136d9ef4d1",
"reference": "4639993365dbb3c935d420df22f84c136d9ef4d1",
"url": "https://api.github.com/repos/johnpbloch/wordpress-core/zipball/3e67d8b6ee6c11e8ce404da4627117fb7fbf9266",
"reference": "3e67d8b6ee6c11e8ce404da4627117fb7fbf9266",
"shasum": ""
},
"require": {
"ext-json": "*",
"php": ">=5.6.20"
},
"provide": {
"wordpress/core-implementation": "5.4.1"
"wordpress/core-implementation": "5.4.2"
},
"type": "wordpress-core",
"extra": {
......@@ -301,31 +309,32 @@
"cms",
"wordpress"
],
"time": "2020-04-29T19:02:53+00:00"
"time": "2020-06-10T22:05:38+00:00"
},
{
"name": "johnpbloch/wordpress-core-installer",
"version": "1.0.2",
"version": "2.0.0",
"source": {
"type": "git",
"url": "https://github.com/johnpbloch/wordpress-core-installer.git",
"reference": "fd12f5cfe27223b92b0f4bbc097059eb23cc56c4"
"reference": "237faae9a60a4a2e1d45dce1a5836ffa616de63e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/johnpbloch/wordpress-core-installer/zipball/fd12f5cfe27223b92b0f4bbc097059eb23cc56c4",
"reference": "fd12f5cfe27223b92b0f4bbc097059eb23cc56c4",
"url": "https://api.github.com/repos/johnpbloch/wordpress-core-installer/zipball/237faae9a60a4a2e1d45dce1a5836ffa616de63e",
"reference": "237faae9a60a4a2e1d45dce1a5836ffa616de63e",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1.0"
"composer-plugin-api": "^1.0 || ^2.0",
"php": ">=5.6.0"
},
"conflict": {
"composer/installers": "<1.0.6"
},
"require-dev": {
"composer/composer": "^1.0",
"phpunit/phpunit": ">=4.8.35"
"composer/composer": "^1.0 || ^2.0",
"phpunit/phpunit": ">=5.7.27"
},
"type": "composer-plugin",
"extra": {
......@@ -350,7 +359,7 @@
"keywords": [
"wordpress"
],
"time": "2018-11-09T20:10:38+00:00"
"time": "2020-04-16T21:44:57+00:00"
},
{
"name": "koodimonni/composer-dropin-installer",
......@@ -405,9 +414,7 @@
},
"dist": {
"type": "zip",
"url": "https://downloads.wordpress.org/plugin/disable-emojis.1.7.2.zip",
"reference": null,
"shasum": null
"url": "https://downloads.wordpress.org/plugin/disable-emojis.1.7.2.zip"
},
"require": {
"composer/installers": "~1.0"
......@@ -425,9 +432,7 @@
},
"dist": {
"type": "zip",
"url": "https://downloads.wordpress.org/plugin/disable-wordpress-updates.1.6.6.zip",
"reference": null,
"shasum": null
"url": "https://downloads.wordpress.org/plugin/disable-wordpress-updates.1.6.6.zip"
},
"require": {
"composer/installers": "~1.0"
......@@ -450,9 +455,7 @@
},
"dist": {
"type": "zip",
"url": "https://downloads.wordpress.org/plugin/hyperdb.1.6.zip",
"reference": null,
"shasum": null
"url": "https://downloads.wordpress.org/plugin/hyperdb.1.6.zip"
},
"require": {
"composer/installers": "~1.0"
......@@ -475,9 +478,7 @@
},
"dist": {
"type": "zip",
"url": "https://downloads.wordpress.org/plugin/more-privacy-options.zip?timestamp=1470691290",
"reference": null,
"shasum": null
"url": "https://downloads.wordpress.org/plugin/more-privacy-options.zip?timestamp=1470691290"
},
"require": {
"composer/installers": "~1.0"
......@@ -500,9 +501,7 @@
},
"dist": {
"type": "zip",
"url": "https://downloads.wordpress.org/plugin/wpmu-new-blog-defaults.2.2.2.zip",
"reference": null,
"shasum": null
"url": "https://downloads.wordpress.org/plugin/wpmu-new-blog-defaults.2.2.2.zip"
},
"require": {
"composer/installers": "~1.0"
......@@ -520,9 +519,7 @@
},
"dist": {
"type": "zip",
"url": "https://downloads.wordpress.org/theme/minimalism.1.0.3.zip",
"reference": null,
"shasum": null
"url": "https://downloads.wordpress.org/theme/minimalism.1.0.3.zip"
},
"require": {
"composer/installers": "~1.0"
......@@ -616,5 +613,6 @@
"platform": {
"php": ">=7.1"
},
"platform-dev": []
"platform-dev": [],
"plugin-api-version": "1.1.0"
}
patches/0001-Patched-Disable-Updates-to-run-checks-during-cron-jo.patch
+ 7
− 92
View file @ b33b81de
From a4968df0b59c116fb8118fd625c5ed12e5e53d6d Mon Sep 17 00:00:00 2001
From: lucha <lucha@paranoici.org>
Date: Wed, 19 Apr 2017 14:44:43 +0200
Subject: [PATCH] Patched Disable Updates to run checks during cron jobs
---
wp-content/mu-plugins/disable-updates.php | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/wp-content/mu-plugins/disable-updates.php b/wp-content/mu-plugins/disable-updates.php
index e3139547..dd58cca5 100644
--- a/wp-content/mu-plugins/disable-updates.php
+++ b/wp-content/mu-plugins/disable-updates.php
@@ -59,6 +59,8 @@ class OS_Disable_WordPress_Updates {
* @author scripts@schloebe.de
*/
function __construct() {
+ if (!defined('AI_CRON_SCRIPT')) {
+
add_action( 'admin_init', array(&$this, 'admin_init') );
/*
@@ -92,8 +94,8 @@ class OS_Disable_WordPress_Updates {
* 3.0
*/
add_filter( 'pre_site_transient_update_core', array($this, 'last_checked_atm') );
-
-
+
+
/*
* Filter schedule checks
*
@@ -129,6 +131,7 @@ class OS_Disable_WordPress_Updates {
if( !defined( 'WP_AUTO_UPDATE_CORE') ) define( 'WP_AUTO_UPDATE_CORE', false );
add_filter( 'pre_http_request', array($this, 'block_request'), 10, 3 );
+ }
--- a/disable-updates.php
+++ b/disable-updates.php
@@ -282,6 +282,6 @@ class OS_Disable_WordPress_Updates {
}
@@ -140,13 +143,13 @@ class OS_Disable_WordPress_Updates {
*/
function admin_init() {
if ( !function_exists("remove_action") ) return;
-
+
/*
* Remove 'update plugins' option from bulk operations select list
*/
global $current_user;
$current_user->allcaps['update_plugins'] = 0;
-
+
/*
* Hide maintenance and update nag
*/
@@ -154,7 +157,7 @@ class OS_Disable_WordPress_Updates {
remove_action( 'network_admin_notices', 'update_nag', 3 );
remove_action( 'admin_notices', 'maintenance_nag' );
remove_action( 'network_admin_notices', 'maintenance_nag' );
-
+
/*
* Disable Theme Updates
@@ -263,8 +266,8 @@ class OS_Disable_WordPress_Updates {
}
return $event;
}
-
-
+
+
/**
* Override version check info
*
@@ -272,12 +275,12 @@ class OS_Disable_WordPress_Updates {
*/
public function last_checked_atm( $t ) {
include( ABSPATH . WPINC . '/version.php' );
-
+
$current = new stdClass;
$current->updates = array();
$current->version_checked = $wp_version;
$current->last_checked = time();
-
+
return $current;
}
}
--
2.17.1
-if ( class_exists('OS_Disable_WordPress_Updates') ) {
+if ( class_exists('OS_Disable_WordPress_Updates') and !defined('AI_CRON_SCRIPT') {
$OS_Disable_WordPress_Updates = new OS_Disable_WordPress_Updates();
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment