From: Stig Bakken <ssb@php.net>
Date: Sun, 24 Mar 2002 01:52:38 +0000 (+0000)
Subject: * move logic to _assertStateDir
X-Git-Tag: php-4.3.0dev-ZendEngine2-Preview1~1070
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=365505daed9e3029d6496eb79462cd0ade5db788;p=php

* move logic to _assertStateDir
---

diff --git a/pear/PEAR/Registry.php b/pear/PEAR/Registry.php
index 9167464cf3..2ae1bd89b8 100644
--- a/pear/PEAR/Registry.php
+++ b/pear/PEAR/Registry.php
@@ -109,7 +109,9 @@ class PEAR_Registry extends PEAR
     function _assertStateDir()
     {
         if (!@is_dir($this->statedir)) {
-            return System::mkdir("-p {$this->statedir}");
+            if (!System::mkdir("-p {$this->statedir}")) {
+                return $this->raiseError("could not create directory '{$this->statedir}'");
+            }
         }
         return true;
     }
@@ -210,8 +212,8 @@ class PEAR_Registry extends PEAR
             // XXX does not check type of lock (LOCK_SH/LOCK_EX)
             return true;
         }
-        if (!@$this->_assertStateDir()) {
-            return $this->raiseError("could not create directory '{$this->statedir}'");
+        if (PEAR::isError($err = $this->_assertStateDir())) {
+            return $err;
         }
         $this->lock_fp = @fopen($this->lockfile, 'w');
         if (!is_resource($this->lock_fp)) {