Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Replace function die (alias) by exit.
Signed-off-by: Mark Story <mark@mark-story.com>
  • Loading branch information
jrbasso authored and markstory committed Nov 21, 2009
1 parent 9b6b258 commit 1acc60b
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cake/console/libs/templates/skel/config/acl.ini.php
@@ -1,4 +1,4 @@
;<?php die() ?>
;<?php exit() ?>
; SVN FILE: $Id$
;/**
; * Short description for file.
Expand Down
4 changes: 2 additions & 2 deletions cake/console/libs/templates/skel/webroot/css.php
Expand Up @@ -66,15 +66,15 @@ function write_css_cache($path, $content) {
}

if (preg_match('|\.\.|', $url) || !preg_match('|^ccss/(.+)$|i', $url, $regs)) {
die('Wrong file name.');
exit('Wrong file name.');
}

$filename = 'css/' . $regs[1];
$filepath = CSS . $regs[1];
$cachepath = CACHE . 'css' . DS . str_replace(array('/','\\'), '-', $regs[1]);

if (!file_exists($filepath)) {
die('Wrong file name.');
exit('Wrong file name.');
}

if (file_exists($cachepath)) {
Expand Down
2 changes: 1 addition & 1 deletion cake/console/libs/templates/skel/webroot/test.php
Expand Up @@ -95,7 +95,7 @@
require_once CAKE_TESTS_LIB . 'test_manager.php';

if (Configure::read('debug') < 1) {
die(__('Debug setting does not allow access to this url.', true));
exit(__('Debug setting does not allow access to this url.', true));
}

if (!isset($_SERVER['SERVER_NAME'])) {
Expand Down
2 changes: 1 addition & 1 deletion cake/libs/debugger.php
Expand Up @@ -218,7 +218,7 @@ function handleError($code, $description, $file = null, $line = null, $context =
}

if ($error == 'Fatal Error') {
die();
exit();
}
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion cake/libs/model/datasources/dbo/dbo_odbc.php
Expand Up @@ -95,7 +95,7 @@ function connect() {
$connect = 'odbc_connect';
}
if (!function_exists($connect)) {
die('no odbc?');
exit('no odbc?');
}
$this->connected = false;
$this->connection = $connect($config['database'], $config['login'], $config['password'], SQL_CUR_USE_ODBC);
Expand Down
2 changes: 1 addition & 1 deletion cake/tests/test_app/config/acl.ini.php
@@ -1,4 +1,4 @@
;<?php die() ?>
;<?php exit() ?>
; SVN FILE: $Id$
;/**
; * Test App Ini Based Acl Config File
Expand Down

0 comments on commit 1acc60b

Please sign in to comment.