From e8be303af3b3cb5187101e9d6f160e0aa8f07285 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 24 Aug 2012 07:36:12 -0400
Subject: [PATCH] Added tests for shared functions, fixed small issues
---
program/include/rcube_shared.inc | 8 ++++----
tests/phpunit.xml | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index 5b839d8..276940c 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -108,11 +108,11 @@
/**
- * Remove slash at the end of the string
+ * Remove slashes at the end of the string
*/
function unslashify($str)
{
- return preg_replace('/\/$/', '', $str);
+ return preg_replace('/\/+$/', '', $str);
}
@@ -231,7 +231,7 @@
{
$keys = array();
- if (!empty($array)) {
+ if (!empty($array) && is_array($array)) {
foreach ($array as $key => $child) {
$keys[] = $key;
foreach (array_keys_recursive($child) as $val) {
@@ -255,7 +255,7 @@
/**
- * Remove single and double quotes from given string
+ * Remove single and double quotes from a given string
*
* @param string Input value
*
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index cfd066e..d6212f4 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -7,6 +7,7 @@
<file>MailDecode.php</file>
<file>MailFunc.php</file>
<file>ModCss.php</file>
+ <file>Shared.php</file>
<file>Utils.php</file>
<file>VCards.php</file>
</testsuite>
--
Gitblit v1.9.1