summaryrefslogtreecommitdiffstats
path: root/Auth
diff options
context:
space:
mode:
authortailor <cygnus@janrain.com>2008-05-21 16:36:19 +0000
committertailor <cygnus@janrain.com>2008-05-21 16:36:19 +0000
commit168c320b3b3261be04c464d20ada65b38311c8d4 (patch)
treed07443f7fc398acd9e76681ce078a114f658bc26 /Auth
parentbad45cb45aea88552dc61bbfca03b946b173bf76 (diff)
downloadphp-openid-168c320b3b3261be04c464d20ada65b38311c8d4.zip
php-openid-168c320b3b3261be04c464d20ada65b38311c8d4.tar.gz
php-openid-168c320b3b3261be04c464d20ada65b38311c8d4.tar.bz2
[project @ Auth_OpenID::ensureDir: add terminal case when dirname returns its input]
Diffstat (limited to 'Auth')
-rw-r--r--Auth/OpenID.php11
1 files changed, 7 insertions, 4 deletions
diff --git a/Auth/OpenID.php b/Auth/OpenID.php
index f5d559c..41e850b 100644
--- a/Auth/OpenID.php
+++ b/Auth/OpenID.php
@@ -203,11 +203,14 @@ class Auth_OpenID {
if (is_dir($dir_name) || @mkdir($dir_name)) {
return true;
} else {
- if (Auth_OpenID::ensureDir(dirname($dir_name))) {
- return is_dir($dir_name) || @mkdir($dir_name);
- } else {
- return false;
+ $parent_dir = dirname($dir_name);
+
+ // Terminal case; there is no parent directory to create.
+ if ($parent_dir == $dir_name) {
+ return true;
}
+
+ return (Auth_OpenID::ensureDir($parent_dir) && @mkdir($dir_name));
}
}