diff --git a/CHANGELOG.md b/CHANGELOG.md
index 522561f9..07de0bb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,11 @@
# Changelog
-### 2.7.0
+### 2.6.1
* Updated German translation by [Mario Siegmann](http://web-alltag.de/)
+* Fixed error catching not working correctly
+* Updated error catching to work with snippets including functions and classes
+* Updated CodeMirror to version 5.11
+* Fixed editor autoresizing
### 2.6.0
* Reconfigured plugin to use classloader and converted a lot of functional code into OOP code
diff --git a/README.md b/README.md
index ce9ab100..34db467a 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
# Code Snippets [![Build Status](https://travis-ci.org/sheabunge/code-snippets.png?branch=master)](https://travis-ci.org/sheabunge/code-snippets)
* __Requires at least:__ [WordPress 3.6](https://wordpress.org/download/) or later
-* __Tested up to:__ WordPress 4.4
-* __Stable version:__ [2.6.0](https://downloads.wordpress.org/plugin/code-snippets.latest-stable.zip)
+* __Tested up to:__ WordPress 4.4.2
+* __Stable version:__ [2.6.1](https://downloads.wordpress.org/plugin/code-snippets.latest-stable.zip)
* __License:__ [MIT](license.txt)
Code Snippets is an easy, clean and simple way to add code snippets to your site. It removes the need to add custom snippets to your theme theme's `functions.php` file.
diff --git a/code-snippets.php b/code-snippets.php
index b6d9c409..7ec4910a 100644
--- a/code-snippets.php
+++ b/code-snippets.php
@@ -7,7 +7,7 @@
* contribute to the localization, please see https://github.com/sheabunge/code-snippets
*
* @package Code_Snippets
- * @version 2.5.1
+ * @version 2.6.1
* @author Shea Bunge
* @copyright Copyright (c) 2012-2015, Shea Bunge
* @link https://github.com/sheabunge/code-snippets
@@ -20,7 +20,7 @@
Description: An easy, clean and simple way to add code snippets to your site. No need to edit to your theme's functions.php file again!
Author: Shea Bunge
Author URI: https://bungeshea.com
-Version: 2.6.0
+Version: 2.6.1
License: MIT
License URI: license.txt
Text Domain: code-snippets
@@ -42,7 +42,7 @@
* @since 2.0
* @var string A PHP-standardized version number string
*/
-define( 'CODE_SNIPPETS_VERSION', '2.5.1' );
+define( 'CODE_SNIPPETS_VERSION', '2.6.1' );
/**
* The full path to the main file of this plugin
@@ -89,7 +89,7 @@ function code_snippets_autoload( $class_name ) {
/**
* Retrieve the instance of the main plugin class
*
- * @since [NEXT_VERSION]
+ * @since 2.6.0
* @return Code_Snippets
*/
function code_snippets() {
diff --git a/languages/code-snippets.pot b/languages/code-snippets.pot
index 4fe869ab..dec27a07 100644
--- a/languages/code-snippets.pot
+++ b/languages/code-snippets.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: code-snippets 2.6.0\n"
+"Project-Id-Version: code-snippets 2.6.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-29 21:46+1100\n"
+"POT-Creation-Date: 2016-02-09 23:26+1100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -27,108 +27,108 @@ msgstr ""
msgid "Edit Snippet"
msgstr ""
-#: php/admin-menus/class-edit-menu.php:28
+#: php/admin-menus/class-edit-menu.php:32
msgid "Add New"
msgstr ""
-#: php/admin-menus/class-edit-menu.php:29 php/views/edit.php:31
+#: php/admin-menus/class-edit-menu.php:33 php/views/edit.php:31
msgid "Add New Snippet"
msgstr ""
-#: php/admin-menus/class-edit-menu.php:150
+#: php/admin-menus/class-edit-menu.php:178
msgid "Don't Panic"
msgstr ""
-#: php/admin-menus/class-edit-menu.php:151
+#: php/admin-menus/class-edit-menu.php:179
#, php-format
msgid ""
"The code snippet you are trying to save produced a fatal error on line %d:"
msgstr ""
-#: php/admin-menus/class-edit-menu.php:153
+#: php/admin-menus/class-edit-menu.php:181
msgid ""
"The previous version of the snippet is unchanged, and the rest of this site "
"should be functioning normally as before."
msgstr ""
-#: php/admin-menus/class-edit-menu.php:154
+#: php/admin-menus/class-edit-menu.php:182
msgid ""
"Please use the back button in your browser to return to the previous page "
"and try to fix the code error."
msgstr ""
-#: php/admin-menus/class-edit-menu.php:155
+#: php/admin-menus/class-edit-menu.php:183
msgid ""
"If you prefer, you can close this page and discard the changes you just "
"made. No changes will be made to this site."
msgstr ""
-#: php/admin-menus/class-edit-menu.php:280 php/class-list-table.php:324
+#: php/admin-menus/class-edit-menu.php:303 php/class-list-table.php:324
msgid "Description"
msgstr ""
-#: php/admin-menus/class-edit-menu.php:310 php/class-list-table.php:325
+#: php/admin-menus/class-edit-menu.php:333 php/class-list-table.php:325
msgid "Tags"
msgstr ""
-#: php/admin-menus/class-edit-menu.php:314
+#: php/admin-menus/class-edit-menu.php:337
msgid "Enter a list of tags; separated by commas"
msgstr ""
-#: php/admin-menus/class-edit-menu.php:333
+#: php/admin-menus/class-edit-menu.php:356
msgid "Run snippet everywhere"
msgstr ""
-#: php/admin-menus/class-edit-menu.php:334
+#: php/admin-menus/class-edit-menu.php:357
msgid "Only run in administration area"
msgstr ""
-#: php/admin-menus/class-edit-menu.php:335
+#: php/admin-menus/class-edit-menu.php:358
msgid "Only run on site front-end"
msgstr ""
-#: php/admin-menus/class-edit-menu.php:339
+#: php/admin-menus/class-edit-menu.php:362
msgid "Scope"
msgstr ""
-#: php/admin-menus/class-edit-menu.php:359
+#: php/admin-menus/class-edit-menu.php:382
msgid "Sharing"
msgstr ""
-#: php/admin-menus/class-edit-menu.php:363
+#: php/admin-menus/class-edit-menu.php:386
msgid "Allow this snippet to be activated on individual sites on the network"
msgstr ""
-#: php/admin-menus/class-edit-menu.php:423
+#: php/admin-menus/class-edit-menu.php:446
#, php-format
msgid "The snippet has been deactivated due to an error on line %d:"
msgstr ""
-#: php/admin-menus/class-edit-menu.php:428
+#: php/admin-menus/class-edit-menu.php:451
msgid "The snippet has been deactivated due to an error in the code."
msgstr ""
-#: php/admin-menus/class-edit-menu.php:435
+#: php/admin-menus/class-edit-menu.php:458
msgid "An error occurred when saving the snippet."
msgstr ""
-#: php/admin-menus/class-edit-menu.php:440
+#: php/admin-menus/class-edit-menu.php:463
msgid "Snippet added."
msgstr ""
-#: php/admin-menus/class-edit-menu.php:441
+#: php/admin-menus/class-edit-menu.php:464
msgid "Snippet updated."
msgstr ""
-#: php/admin-menus/class-edit-menu.php:442
+#: php/admin-menus/class-edit-menu.php:465
msgid "Snippet added and activated."
msgstr ""
-#: php/admin-menus/class-edit-menu.php:443
+#: php/admin-menus/class-edit-menu.php:466
msgid "Snippet updated and activated."
msgstr ""
-#: php/admin-menus/class-edit-menu.php:444
+#: php/admin-menus/class-edit-menu.php:467
msgid "Snippet updated and deactivated."
msgstr ""
@@ -207,7 +207,7 @@ msgid "Selected snippets deleted."
msgstr ""
#: php/admin-menus/class-settings-menu.php:16
-#: php/admin-menus/class-settings-menu.php:36 php/views/edit.php:132
+#: php/admin-menus/class-settings-menu.php:36 php/views/edit.php:134
msgid "Settings"
msgstr ""
@@ -493,12 +493,12 @@ msgid "Edit"
msgstr ""
#: php/class-list-table.php:142 php/class-list-table.php:202
-#: php/class-list-table.php:371 php/views/edit.php:109
+#: php/class-list-table.php:371 php/views/edit.php:111
msgid "Export"
msgstr ""
#: php/class-list-table.php:151 php/class-list-table.php:214
-#: php/class-list-table.php:372 php/views/edit.php:121
+#: php/class-list-table.php:372 php/views/edit.php:123
msgid "Delete"
msgstr ""
@@ -754,15 +754,15 @@ msgstr ""
msgid "Code"
msgstr ""
-#: php/views/edit.php:79 php/views/edit.php:93
+#: php/views/edit.php:81 php/views/edit.php:95
msgid "Save Changes and Activate"
msgstr ""
-#: php/views/edit.php:99
+#: php/views/edit.php:101
msgid "Save Changes and Deactivate"
msgstr ""
-#: php/views/edit.php:116
+#: php/views/edit.php:118
msgid ""
"You are about to permanently delete this snippet.\n"
"'Cancel' to stop, 'OK' to delete."
diff --git a/package.json b/package.json
index 1c3d0e6f..fce53bef 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "code-snippets",
- "version": "2.6.0",
+ "version": "2.6.1",
"description": "Manage code snippets running on a WordPress-powered site through a graphical interface",
"homepage": "https://wordpress.org/plugins/code-snippets",
"main": "Gruntfile.js",
diff --git a/readme.txt b/readme.txt
index a5930843..7b6c4f63 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,8 +3,8 @@ Contributors: bungeshea
Donate link: https://bungeshea.com/donate/
Tags: code-snippets, snippets, code, php, network, multisite
Requires at least: 3.6
-Tested up to: 4.4
-Stable tag: 2.6.0
+Tested up to: 4.4.2
+Stable tag: 2.6.1
License: MIT
License URI: license.txt
@@ -116,6 +116,13 @@ That's fantastic! Fork the [repository on GitHub](http://github.com/sheabunge/co
== Changelog ==
+= 2.6.1 =
+* Updated German translation by [Mario Siegmann](http://web-alltag.de/)
+* Fixed error catching not working correctly
+* Updated error catching to work with snippets including functions and classes
+* Updated CodeMirror to version 5.11
+* Fixed editor autoresizing
+
= 2.6.0 =
* Reconfigured plugin to use classloader and converted a lot of functional code into OOP code
* Updated CodeMirror to version 5.10.0