[Gemstracker-svn] SF.net SVN: gemstracker:[535] trunk/library

[<gem...@li...>]

Revision: 535
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=535&view=rev
Author:   matijsdejong
Date:     2012-03-08 10:05:43 +0000 (Thu, 08 Mar 2012)
Log Message:
-----------
Merged revision(s) 534 from tags/1.5.1/library:
isset($this->{non existing prop}) causes PHP error
........

Modified Paths:
--------------
    trunk/library/classes/Gems/Project/ProjectSettings.php

Property Changed:
----------------
    trunk/library/


Property changes on: trunk/library
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/1.5.0-pulse/library:306-344,346,467
/branches/1.5.x/library:426-455,458-472,475-481
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
/tags/1.5.1/library:485,489,509-510
   + /branches/1.5.0-pulse/library:306-344,346,467
/branches/1.5.x/library:426-455,458-472,475-481
/branches/newUser:113-150
/branches/newUser2:175-207
/branches/userloader:259-324
/tags/1.5.0beta1/library:305
/tags/1.5.1/library:485,489,509-510,534

Modified: trunk/library/classes/Gems/Project/ProjectSettings.php
===================================================================
--- trunk/library/classes/Gems/Project/ProjectSettings.php	2012-03-08 10:01:02 UTC (rev 534)
+++ trunk/library/classes/Gems/Project/ProjectSettings.php	2012-03-08 10:05:43 UTC (rev 535)
@@ -193,7 +193,7 @@
      */
     public function getAccountDelayFactor()
     {
-        if (isset($this->account) && isset($this->account['delayFactor'])) {
+        if ($this->offsetExists('account') && isset($this->account['delayFactor'])) {
             return intval($this->account['delayFactor']);
         } else {
             return 4;
@@ -279,7 +279,7 @@
         // MUtil_Echo::track($codes);
 
         $rules = array();
-        if (isset($this->passwords) && is_array($this->passwords)) {
+        if ($this->offsetExists('passwords') && is_array($this->passwords)) {
             $this->_getPasswordRules($this->passwords, $codes, $rules);
         }
 
@@ -293,7 +293,7 @@
      */
     public function getSessionTimeOut()
     {
-        if (isset($this->session, $this->session['idleTimeout'])) {
+        if ($this->offsetExists('session') && isset($this->session['idleTimeout'])) {
             return $this->session['idleTimeout'];
         } else {
             return $this->defaultSessionTimeout;
@@ -307,7 +307,7 @@
      */
     public function getSuperAdminName()
     {
-        if (isset($this->admin) && isset($this->admin['user'])) {
+        if ($this->offsetExists('admin') && isset($this->admin['user'])) {
             return trim($this->admin['user']);
         }
     }
@@ -319,7 +319,7 @@
      */
     protected function getSuperAdminPassword()
     {
-        if (isset($this->admin) && isset($this->admin['pwd'])) {
+        if ($this->offsetExists('admin') && isset($this->admin['pwd'])) {
             return trim($this->admin['pwd']);
         }
     }
@@ -331,7 +331,7 @@
      */
     public function getSuperAdminIPRanges()
     {
-        if (isset($this->admin['ipRanges'])) {
+        if ($this->offsetExists('admin') && isset($this->admin['ipRanges'])) {
             return $this->admin['ipRanges'];
         }
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.