From ea1ed4f65c211b1eb35200e501d4ce38faa5c5b5 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Wed, 24 Jul 2013 20:16:23 +0000
Subject: [PATCH] Typo in class.config.php for pw_reset_window
---
include/class.config.php | 2 +-
setup/test/tests/test.undefinedmethods.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/class.config.php b/include/class.config.php
index 372630987..0a458764f 100644
--- a/include/class.config.php
+++ b/include/class.config.php
@@ -141,7 +141,7 @@ class OsticketConfig extends Config {
var $defaults = array(
'allow_pw_reset' => true,
- 'pw_reset_mins' => 30,
+ 'pw_reset_window' => 30,
);
function OsticketConfig($section=null) {
diff --git a/setup/test/tests/test.undefinedmethods.php b/setup/test/tests/test.undefinedmethods.php
index d5a0f6526..4d22d1aaf 100644
--- a/setup/test/tests/test.undefinedmethods.php
+++ b/setup/test/tests/test.undefinedmethods.php
@@ -10,8 +10,8 @@ class UndefinedMethods extends Test {
foreach ($scripts as $s) {
$matches = array();
preg_match_all('/^\s*(?:\/\*[^*]*\*\/)?\s*'
- .'(?:private|public|static|abstract)?\s*'
- .'function\s+&?\s*([^(\s]+)\s*\\(/m',
+ .'(?:(?:private|public|protected|static|abstract)\s+)*'
+ .'function\s+&?\s*([^(\s]+)\s*\(/m',
file_get_contents($s), $matches);
$function_defs = array_merge($function_defs, $matches[1]);
}
--
GitLab