From 3010e02e68f51325da31625a29fe940646f6ff04 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 18 Apr 2011 20:43:26 +0000 Subject: [PATCH] Added patch_core.sh to all 'cored' PHP projects to ease patching of the 'core' project --- inc/functions.php | 6 +++--- inc/template-functions.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/inc/functions.php b/inc/functions.php index cb8212eb88..45fb99ea6c 100644 --- a/inc/functions.php +++ b/inc/functions.php @@ -634,9 +634,9 @@ function array_pk_sort (&$array, $a_sort, $primary_key = '0', $order = -1, $nums // // Deprecated : $length (still has one reference in this function) -// Optional : $DATA +// Optional : $extraData // -function generateRandomCode ($length, $code, $userid, $DATA = '') { +function generateRandomCode ($length, $code, $userid, $extraData = '') { // Build server string $server = $_SERVER['PHP_SELF'] . getEncryptSeperator() . detectUserAgent() . getEncryptSeperator() . getenv('SERVER_SOFTWARE') . getEncryptSeperator() . detectRealIpAddress() . getEncryptSeperator() . detectRemoteAddr(); @@ -654,7 +654,7 @@ function generateRandomCode ($length, $code, $userid, $DATA = '') { } // END - if // Build string from misc data - $data = $code . getEncryptSeperator() . $userid . getEncryptSeperator() . $DATA; + $data = $code . getEncryptSeperator() . $userid . getEncryptSeperator() . $extraData; // Add more additional data if (isSessionVariableSet('u_hash')) { diff --git a/inc/template-functions.php b/inc/template-functions.php index cac8b529dd..aff7a024c3 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -543,8 +543,8 @@ function getMenuCssClasses ($data) { } // Generate XHTML code for the CAPTCHA -function generateCaptchaCode ($code, $type, $DATA, $userid) { - return 'Code ' . $code . ''; +function generateCaptchaCode ($code, $type, $type, $userid) { + return 'Code ' . $code . ''; } // Compiles the given HTML/mail code -- 2.39.5