Merge branch 'master' of /var/www/trunk

1 files changed, 3 insertions, 3 deletions

diff --git a/classes/Notice.php b/classes/Notice.php
index 5fa078205..de7540705 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -443,7 +443,7 @@ class Notice extends Memcached_DataObject
         # On a cache hit, return a DB-object-like wrapper
 
         if ($notices !== false) {
-            $wrapper = new NoticeWrapper(array_slice($notices, $offset, $limit));
+            $wrapper = new ArrayWrapper(array_slice($notices, $offset, $limit));
             return $wrapper;
         }
 
@@ -483,7 +483,7 @@ class Notice extends Memcached_DataObject
 
                 # return a wrapper of the array for use now
 
-                return new NoticeWrapper(array_slice($notices, $offset, $limit));
+                return new ArrayWrapper(array_slice($notices, $offset, $limit));
             }
         }
 
@@ -514,7 +514,7 @@ class Notice extends Memcached_DataObject
 
         # return a wrapper of the array for use now
 
-        $wrapper = new NoticeWrapper(array_slice($notices, $offset, $limit));
+        $wrapper = new ArrayWrapper(array_slice($notices, $offset, $limit));
 
         return $wrapper;
     }