This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
namespace Psr\Http\Header; | |
use Countable, | |
Traversable; | |
/** | |
* A HTTP message header. | |
*/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
namespace Psr\Http\Header; | |
/** | |
* HTTP message header. | |
*/ | |
interface HeaderInterface | |
{ | |
/** |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
namespace Psr\Uri; | |
use Psr\Uri\Exception\InvalidArgumentException; | |
/** | |
* A hierarchical uniform resource identifier (URI) is either an absolute URI | |
* whose scheme-specific part begins with a slash ("/"), or a relative URI, | |
* that is, a URI that does not specify a scheme. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/includes/imagecrop.admin.inc b/includes/imagecrop.admin.inc | |
index ae3d663..ac04f15 100644 | |
--- a/includes/imagecrop.admin.inc | |
+++ b/includes/imagecrop.admin.inc | |
@@ -153,7 +153,7 @@ function imagecrop_image_styles_overview($fid, $style_name, $entity_type = NULL, | |
$imagecrop->addImagecropUi(TRUE); | |
$image_url = image_style_url($style_name, $imagecrop->getFile()->uri); | |
- $image_url .= (variable_get('clean_url', 0) ? '?' : '&'); | |
+ $image_url .= (!variable_get('clean_url', 0) || strpos($image_url, '?') !== FALSE) ? '&' : '?'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/imagecrop.module b/imagecrop.module | |
index f3e2f72..40bf3f1 100644 | |
--- a/imagecrop.module | |
+++ b/imagecrop.module | |
@@ -31,6 +31,10 @@ function imagecrop_permission() { | |
); | |
} | |
+function imagecrop_get_theme() { | |
+ return variable_get('admin_theme'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/fancybox.admin.inc b/fancybox.admin.inc | |
index 8ba8a31..d95ddc3 100644 | |
--- a/fancybox.admin.inc | |
+++ b/fancybox.admin.inc | |
@@ -44,12 +44,6 @@ function fancybox_admin_settings_form($form, &$form_state) { | |
$jquery = drupal_get_library('system', 'jquery'); | |
- if (version_compare($jquery['version'], '1.7', '<')) { | |
- drupal_set_message(t('fancyBox requires jQuery 1.7 or higher. Please !configure to use a higher jQuery version.', array('!configure' => l(t('configure jQuery Update'), 'admin/config/development/jquery_update'))), 'error'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/varnish.module b/varnish.module | |
index 80e7af2..21dfd8e 100644 | |
--- a/varnish.module | |
+++ b/varnish.module | |
@@ -288,6 +288,7 @@ function _varnish_execute_command($client, $command) { | |
} | |
else { | |
// successful connection | |
+ watchdog('varnish', 'Successfully ran command: %command', array('%command' => $command), WATCHDOG_INFO); | |
return $status; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/varnish.module b/varnish.module | |
index 80e7af2..248a564 100644 | |
--- a/varnish.module | |
+++ b/varnish.module | |
@@ -260,7 +260,7 @@ function _varnish_terminal_run($commands) { | |
if ($status['code'] == 107) { // Require authentication | |
$secret = variable_get('varnish_control_key', ''); | |
$challenge = substr($status['msg'], 0, 32); | |
- $pack = $challenge . "\x0A" . $secret . "\x0A" . $challenge . "\x0A"; | |
+ $pack = $challenge . "\x0A" . $secret . $challenge . "\x0A"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/varnish.cache.inc b/varnish.cache.inc | |
index 7628579..a18a846 100644 | |
--- a/varnish.cache.inc | |
+++ b/varnish.cache.inc | |
@@ -71,10 +71,11 @@ class VarnishCache implements DrupalCacheInterface { | |
varnish_purge_all_pages(); | |
} | |
else { | |
- $host = _varnish_get_host(); | |
$base = base_path(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/CHANGELOG.txt b/CHANGELOG.txt | |
index 43f08e7..58e94bb 100644 | |
--- a/CHANGELOG.txt | |
+++ b/CHANGELOG.txt | |
@@ -3,7 +3,6 @@ | |
[#2255129] by wwalc: Introduced support for the codesnippet and mathjax plugins. | |
[#1762328] by wwalc: IMPORTANT: <code> tags are no longer protected by default. | |
[#1327898] by grasmash: Adding new ckeditor_security_filter_alter() hook. | |
-[#2175565] by hswong3i: Download Library with ckeditor.make for Simple Profile Integration. | |
[#2249139] by wwalc: Use CKEditor 4.4.0 from CKEditor CDN (http://cdn.ckeditor.com) by default. |
OlderNewer