| Index: branches/FileBackend/phase3/includes/filerepo/backend/SwiftFileBackend.php |
| — | — | @@ -42,7 +42,7 @@ |
| 43 | 43 | parent::__construct( $config ); |
| 44 | 44 | // Required settings |
| 45 | 45 | $this->auth = new CF_Authentication( |
| 46 | | - $config['swiftUser'], $config['swiftKey'], NULL, $config['swiftAuthUrl'] ); |
| | 46 | + $config['swiftUser'], $config['swiftKey'], null, $config['swiftAuthUrl'] ); |
| 47 | 47 | // Optional settings |
| 48 | 48 | $this->connTTL = isset( $config['connTTL'] ) |
| 49 | 49 | ? $config['connTTL'] |
| — | — | @@ -410,11 +410,11 @@ |
| 411 | 411 | $container = $conn->get_container( $srcCont); |
| 412 | 412 | $obj = $container->get_object( $srcRel ); |
| 413 | 413 | } catch ( NoSuchContainerException $e ) { |
| 414 | | - $obj = NULL; |
| | 414 | + $obj = null; |
| 415 | 415 | } catch ( NoSuchObjectException $e ) { |
| 416 | | - $obj = NULL; |
| | 416 | + $obj = null; |
| 417 | 417 | } catch ( Exception $e ) { // some other exception? |
| 418 | | - $obj = NULL; // fail vs not exists? |
| | 418 | + $obj = null; // fail vs not exists? |
| 419 | 419 | $this->logException( $e, __METHOD__, $params ); |
| 420 | 420 | } |
| 421 | 421 | |