diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-11-22 16:25:42 +0100 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2011-11-22 16:25:42 +0100 |
| commit | b25bf9db4af963269362e16cec0a99326c4439ad (patch) | |
| tree | 7791f82445443cd42c6aebcbcb5a663aae9222f5 | |
| parent | c00a5a042341b8fe10d264ed1ea70177bc5e572d (diff) | |
| parent | e9307ce66afa48398f4685d4bd5bb2c93a8d8238 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
| -rw-r--r-- | application/config/user_agents.php | 1 | ||||
| -rw-r--r-- | system/core/Common.php | 1 | ||||
| -rw-r--r-- | user_guide_src/source/libraries/image_lib.rst | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/application/config/user_agents.php b/application/config/user_agents.php index 03cba9bc8..c3c7eaecb 100644 --- a/application/config/user_agents.php +++ b/application/config/user_agents.php @@ -174,6 +174,7 @@ $mobiles = array( 'mobilexplorer' => "Mobile Explorer", 'operamini' => "Opera Mini", 'opera mini' => "Opera Mini", + 'opera mobi' => "Opera Mini", // Other 'digital paths' => "Digital Paths", diff --git a/system/core/Common.php b/system/core/Common.php index e43bb8db3..b0921fe0c 100644 --- a/system/core/Common.php +++ b/system/core/Common.php @@ -419,6 +419,7 @@ if ( ! function_exists('set_status_header')) 415 => 'Unsupported Media Type', 416 => 'Requested Range Not Satisfiable', 417 => 'Expectation Failed', + 422 => 'Unprocessable Entity', 500 => 'Internal Server Error', 501 => 'Not Implemented', diff --git a/user_guide_src/source/libraries/image_lib.rst b/user_guide_src/source/libraries/image_lib.rst index 300cbef31..14bd128a6 100644 --- a/user_guide_src/source/libraries/image_lib.rst +++ b/user_guide_src/source/libraries/image_lib.rst @@ -360,7 +360,7 @@ Preference Default Value Options Description image headers. **quality** 90% 1 - 100% Sets the quality of the image. The higher the quality the larger the file size. -**padding** None A number The amount of padding, set in pixels, that will be applied to the +**wm_padding** None A number The amount of padding, set in pixels, that will be applied to the watermark to set it away from the edge of your images. **wm_vrt_alignment** bottom top, middle, bottom Sets the vertical alignment for the watermark image. **wm_hor_alignment** center left, center, right Sets the horizontal alignment for the watermark image. |