Skip to content
This repository
Browse code

Add docs.

  • Loading branch information...
commit 71507796c7cb6a00e31a9b7d3e60b25574237eb0 1 parent 6ce4a3a
Mark Story authored
14  lib/Cake/Controller/Component/PaginatorComponent.php
@@ -51,6 +51,20 @@
51 51
  *
52 52
  * This would allow you to have different pagination settings for `Comment` and `Post` models.
53 53
  *
  54
+ * #### Paginating with custom finders
  55
+ *
  56
+ * You can paginate with any find type defined on your model using the `findType` option.
  57
+ *
  58
+ * {{{
  59
+ * $this->Paginator->settings = array(
  60
+ *		'Post' => array(
  61
+ *			'findType' => 'popular'
  62
+ *		)
  63
+ * );
  64
+ * }}}
  65
+ *
  66
+ * Would paginate using the `find('popular')` method.
  67
+ *
54 68
  * @package       Cake.Controller.Component
55 69
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/pagination.html
56 70
  */
7  lib/Cake/Network/Email/CakeEmail.php
@@ -946,13 +946,17 @@ public function domain($domain = null) {
946 946
  * $email->attachments(array('custom_name.png' => array(
947 947
  *		'file' => 'path/to/file',
948 948
  *		'mimetype' => 'image/png',
949  
- *		'contentId' => 'abc123'
  949
+ *		'contentId' => 'abc123',
  950
+ *		'contentDisposition' => false
950 951
  * ));
951 952
  * }}}
952 953
  *
953 954
  * The `contentId` key allows you to specify an inline attachment. In your email text, you
954 955
  * can use `<img src="cid:abc123" />` to display the image inline.
955 956
  *
  957
+ * The `contentDisposition` key allows you to disable the `Content-Disposition` header, this can improve
  958
+ * attachment compatibility with outlook email clients.
  959
+ *
956 960
  * @param string|array $attachments String with the filename or array with filenames
957 961
  * @return array|CakeEmail Either the array of attachments when getting or $this when setting.
958 962
  * @throws SocketException
@@ -991,6 +995,7 @@ public function attachments($attachments = null) {
991 995
  * @param string|array $attachments String with the filename or array with filenames
992 996
  * @return CakeEmail $this
993 997
  * @throws SocketException
  998
+ * @see CakeEmail::attachments()
994 999
  */
995 1000
 	public function addAttachments($attachments) {
996 1001
 		$current = $this->_attachments;

0 notes on commit 7150779

Please sign in to comment.
Something went wrong with that request. Please try again.