diff options
| author | Filipp Lepalaan <filipp@mekanisti.fi> | 2009-10-26 22:57:07 +0200 |
|---|---|---|
| committer | Filipp Lepalaan <filipp@mekanisti.fi> | 2009-10-26 22:57:07 +0200 |
| commit | 730f91b3bab0767563184f99b40a851b6af6b635 (patch) | |
| tree | 448f6ce52cfc39046773ebdd1a4f05cb39db1a17 /Controller.php | |
| parent | c217e77f2540085922b4483c99670eca06923799 (diff) | |
| parent | b69995e1d0bcd5ea1185acfda4899e11f1d8e624 (diff) | |
| download | main-730f91b3bab0767563184f99b40a851b6af6b635.tar.gz main-730f91b3bab0767563184f99b40a851b6af6b635.tar.bz2 main-730f91b3bab0767563184f99b40a851b6af6b635.zip | |
Merge branch 'master' of github.com:filipp/main
Conflicts:
Db.php
Diffstat (limited to 'Controller.php')
| -rw-r--r-- | Controller.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Controller.php b/Controller.php index 6ab61df..84947b0 100644 --- a/Controller.php +++ b/Controller.php @@ -229,7 +229,7 @@ class Controller if (empty($data)) { App::log("Attempted to insert empty data"); - exit(App::error("Insert failed - nothing to insert")); + return App::error("Nothing to insert"); } $insert = ""; @@ -278,7 +278,7 @@ class Controller } if (empty($data)) { - exit(self::error("Update with empty parameters")); + return App::error("Update with empty parameters"); } if (empty($where)) { @@ -325,7 +325,7 @@ class Controller $file = "../system/views/{$this->table}/{$view}.{$type}"; if (!is_file($file)) { - exit(App::error("{$this->table}_{$view}_{$type}: no such view")); + return App::error("{$this->table}_{$view}_{$type}: no such view"); } if ($data) { |