summaryrefslogtreecommitdiff
path: root/modules/gallery_unit_test/controllers/gallery_unit_test.php
diff options
context:
space:
mode:
authorNathan Kinkade <nkinkade@nkinka.de>2010-12-23 02:12:38 +0000
committerNathan Kinkade <nkinkade@nkinka.de>2010-12-23 02:12:38 +0000
commit5e17a5e7fcb678bd7081bdf8089afec5b25f3aff (patch)
tree9590eae390af1f72b72ddc6500a2566e3558e3bb /modules/gallery_unit_test/controllers/gallery_unit_test.php
parentcf1965957c48b1c88a3913f8167688d03d191cec (diff)
parent032e6fde5f99c3150a4ae70e410ce314d8c3877a (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery_unit_test/controllers/gallery_unit_test.php')
-rw-r--r--modules/gallery_unit_test/controllers/gallery_unit_test.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/modules/gallery_unit_test/controllers/gallery_unit_test.php b/modules/gallery_unit_test/controllers/gallery_unit_test.php
index c4a891ba..e241e1dd 100644
--- a/modules/gallery_unit_test/controllers/gallery_unit_test.php
+++ b/modules/gallery_unit_test/controllers/gallery_unit_test.php
@@ -132,7 +132,6 @@ class Gallery_Unit_Test_Controller extends Controller {
graphics::choose_default_toolkit();
$filter = count($_SERVER["argv"]) > 2 ? $_SERVER["argv"][2] : null;
- set_time_limit(300);
print new Unit_Test($modules, $filter);
} catch (ORM_Validation_Exception $e) {
print "Validation Exception: {$e->getMessage()}\n";