Commit 989532f6 authored by Seamus Lee's avatar Seamus Lee

Fix up pear-execption-fix as per comment from tim

parent 8aa9061e
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "a0837dd64bed6ca00c62e373ed2c365e",
"hash": "647671f50570fcf03087cf4719750895",
"content-hash": "3475b3f4ae0936e68714b9f94d44f709",
"packages": [
{
......@@ -169,12 +169,12 @@
"source": {
"type": "git",
"url": "https://github.com/pear/Validate_Finance_CreditCard.git",
"reference": "c3689983257d73ac70ec7e355fadf895ba40d4ed"
"reference": "a74da657d7a6f24b7e669294b32812e9a947519f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/pear/Validate_Finance_CreditCard/zipball/c3689983257d73ac70ec7e355fadf895ba40d4ed",
"reference": "c3689983257d73ac70ec7e355fadf895ba40d4ed",
"url": "https://api.github.com/repos/pear/Validate_Finance_CreditCard/zipball/a74da657d7a6f24b7e669294b32812e9a947519f",
"reference": "a74da657d7a6f24b7e669294b32812e9a947519f",
"shasum": ""
},
"require": {
......@@ -205,7 +205,7 @@
}
],
"description": "Validation class for credit cards.",
"time": "2016-09-08 09:27:24"
"time": "2016-09-12 08:01:21"
},
{
"name": "phenx/php-font-lib",
......
......@@ -16,8 +16,6 @@ function simple_replace() {
# add in class_exists test as per CRM-8921.
simple_replace vendor/pear/pear_exception/PEAR/Exception.php '^\<\?php^' '<?php
// CRM-8921
if ( class_exists( "'"PEAR_Exception"'" ) ) {
return;
}' /home/seamus/test.php
if ! grep -q 'CRM-8921' vendor/pear/pear_exception/PEAR/Exception.php; then
simple_replace vendor/pear/pear_exception/PEAR/Exception.php '^\<\?php^' '<?php if (class_exists("'"PEAR_Exception"'")) return; /* CRM-8921 */'
fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment