diff options
| author | Elias Probst <mail@eliasprobst.eu> | 2010-12-08 08:39:38 -0400 |
|---|---|---|
| committer | Karl Vollmer <vollmer@ampache.org> | 2010-12-08 08:39:38 -0400 |
| commit | e0f8bbc6385bc83fcbb68d93ee0509a1aa0e6b89 (patch) | |
| tree | e4fae1151f7df9d3d883a6117ec5e730a184ee22 /lib/class/access.class.php | |
| parent | 2682a69a36cd16a7863d6ac1d94e8523f6c3c98f (diff) | |
| download | ampache-e0f8bbc6385bc83fcbb68d93ee0509a1aa0e6b89.tar.gz ampache-e0f8bbc6385bc83fcbb68d93ee0509a1aa0e6b89.tar.bz2 ampache-e0f8bbc6385bc83fcbb68d93ee0509a1aa0e6b89.zip | |
Squashed commit of the following:
commit 8a5127572c89f28f060d3ad0819136f79b65faef
Author: Elias Probst <mail@eliasprobst.eu>
Date: Wed Dec 8 03:51:20 2010 +0100
Rewrote the error message for duplicate ACLs. Expose the error message to the UI.
Diffstat (limited to 'lib/class/access.class.php')
| -rw-r--r-- | lib/class/access.class.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/class/access.class.php b/lib/class/access.class.php index 93bfbfd6..2623e38e 100644 --- a/lib/class/access.class.php +++ b/lib/class/access.class.php @@ -158,7 +158,8 @@ class Access { // Check existing ACL's to make sure we're not duplicating values here if (self::exists($data)) { - debug_event('ACL Create','Error did not create duplicate ACL entrie for ' . $data['start'] . ' - ' . $data['end'],'1'); + debug_event('ACL Create','Error: An ACL equal to the created one does already exist. Not adding another one: ' . $data['start'] . ' - ' . $data['end'],'1'); + Error::add('general',_('Duplicate ACL defined')); return false; } |