Merge branch 'master' into horde_5_2

horde · Nov 14, 2013 · d74f13e · d74f13e
2 parents a341c42 + ad6c682
commit d74f13e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/ansel/config/prefs.php b/ansel/config/prefs.php
@@ -187,8 +187,8 @@
     'type' => 'enum',
     'enum' => array(
         'all' => _("Anyone"),
-        'edit' => _("Authenticated users"),
-        'authenticated' => _("Users with edit permissions")
+        'edit' => _("Users with edit permissions"),
+        'authenticated' =>  _("Authenticated users")
     ),
     'desc' => _("Who should be allowed to download original photos")
 );

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php b/framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php
@@ -154,7 +154,7 @@ class Horde_ActiveSync_State_Mongo extends Horde_ActiveSync_State_Base implement
      * Const'r
      *
      * @param array  $params   Must contain:
-     *      - connection:  (Horde_Mongo_Client  The Horde_Db instance.
+     *      - connection:  (Horde_Mongo_Client  The Horde_Mongo instance.
      *
      * @return Horde_ActiveSync_State_Sql
      */
@@ -460,7 +460,7 @@ public function updateState(
 
                 try {
                     $this->_db->HAS_map->insert($document);
-                } catch (Horde_Db_Exception $e) {
+                } catch (Exception $e) {
                     throw new Horde_ActiveSync_Exception($e);
                 }
                 break;

diff --git a/framework/Core/lib/Horde/Core/Ajax/Application/Handler/Chunk.php b/framework/Core/lib/Horde/Core/Ajax/Application/Handler/Chunk.php
@@ -28,8 +28,13 @@ public function chunkContent()
         $result = new stdClass;
         if (!empty($chunk)) {
             Horde::startBuffer();
-            include $GLOBALS['registry']->get('templates', $this->_base->app) . '/chunks/' . $chunk . '.php';
-            $result->chunk = Horde::endBuffer();
+            try {
+                include $GLOBALS['registry']->get('templates', $this->_base->app) . '/chunks/' . $chunk . '.php';
+                $result->chunk = Horde::endBuffer();
+            } catch (Exception $e) {
+                Horde::endBuffer();
+                throw $e;
+            }
         }
 
         return $result;

diff --git a/imp/config/prefs.php b/imp/config/prefs.php
@@ -906,7 +906,7 @@
 );
 
 // Address book(s) to use when expanding addresses
-// Refer to turba/config/sources.php for possible source values
+// Refer to turba/config/backends.php for possible source values
 //
 // You can provide default values this way:
 //   'value' => json_encode(array('source_one', 'source_two'))
@@ -915,7 +915,7 @@
 );
 
 // Field(s) to use when expanding addresses
-// Refer to turba/config/sources.php for possible source and field values
+// Refer to turba/config/backends.php for possible source and field values
 //
 // If you want to provide a default value, this field depends on the
 // search_sources preference. For example: