Commit 9c0ce66e authored by Gerhard Killesreiter's avatar Gerhard Killesreiter

various improvements

parent b139b154
......@@ -163,7 +163,7 @@ CREATE TABLE boxes (
--
CREATE TABLE cache (
cid varchar(255) NOT NULL default '',
cid varchar(255) BINARY NOT NULL default '',
data longtext,
expire int(11) NOT NULL default '0',
created int(11) NOT NULL default '0',
......
......@@ -107,7 +107,8 @@
"2005-03-21" => "update_128",
"2005-04-14" => "update_129",
"2005-05-06" => "update_130",
"2005-05-07" => "update_131"
"2005-05-07" => "update_131",
"2006-12-19" => "update_132",
);
function update_32() {
......@@ -2394,6 +2395,19 @@ function update_131() {
return $ret;
}
/**
* Cid matching by MySQL should be case-sensitive.
*/
function update_132() {
$ret = array();
if ($GLOBALS['db_type'] == 'mysql') {
$ret[] = update_sql("ALTER TABLE {cache} CHANGE cid cid varchar(255) BINARY NOT NULL default ''");
}
return $ret;
}
function update_sql($sql) {
$edit = $_POST["edit"];
$result = db_query($sql);
......
......@@ -31,11 +31,11 @@ function filter_help($section) {
case 'admin/filters/'. arg(2):
return t('
<p>Every <em>filter</em> performs one particular change on the user input, for example stripping out malicious HTML or making URLs clickable. Choose which filters you want to apply to text in this input format.</p>
<p>If you notice some filters are causing conflicts in the output, you can <a href="%order">rearrange them</a>.</p>', array('%configure' => url('admin/filters/'. arg(2) .'/configure'), '%order' => url('admin/filters/'. arg(2) .'/order')));
<p>If you notice some filters are causing conflicts in the output, you can <a href="%order">rearrange them</a>.</p>', array('%order' => check_url(url('admin/filters/'. arg(2) .'/order'))));
case 'admin/filters/'. arg(2) .'/configure':
return t('
<p>If you cannot find the settings for a certain filter, make sure you\'ve enabled it on the <a href="%url">list filters</a> tab first.</p>', array('%url' => url('admin/filters/'. arg(2) .'/list')));
<p>If you cannot find the settings for a certain filter, make sure you\'ve enabled it on the <a href="%url">list filters</a> tab first.</p>', array('%url' => check_url(url('admin/filters/'. arg(2) .'/list'))));
case 'admin/filters/'. arg(2) .'/order':
return t('
......
......@@ -266,7 +266,7 @@ function path_overview() {
$destination = drupal_get_destination();
while ($data = db_fetch_object($result)) {
$rows[] = array($data->dst, $data->src, l(t('edit'), "admin/path/edit/$data->pid", array(), $destination), l(t('delete'), "admin/path/delete/$data->pid", array(), $destination));
$rows[] = array(check_plain($data->dst), check_plain($data->src), l(t('edit'), "admin/path/edit/$data->pid", array(), $destination), l(t('delete'), "admin/path/delete/$data->pid", array(), $destination));
}
if ($pager = theme('pager', NULL, 50, 0, tablesort_pager())) {
......
......@@ -24,7 +24,7 @@ function system_help($section) {
case 'admin/themes/settings/'. arg(3):
$arg3 = explode('.', arg(3), 2);
$theme = array_pop($arg3);
return t('<p>These options control the display settings for the <code>%template</code> theme. When your site is displayed using this theme, these settings will be used. By clicking "Reset to defaults," you can choose to use the <a href="%global">global settings</a> for this theme.</p>', array('%template' => $theme, '%global' => url('admin/themes/settings')));
return t('<p>These options control the display settings for the <code>%template</code> theme. When your site is displayed using this theme, these settings will be used. By clicking "Reset to defaults," you can choose to use the <a href="%global">global settings</a> for this theme.</p>', array('%template' => check_plain($theme), '%global' => url('admin/themes/settings')));
case 'admin/modules':
return t('<p>Modules are plugins for Drupal that extend its core functionality. Here you can select which modules are enabled. Click on the name of the module in the navigation menu for their individual configuration pages. Once a module is enabled, new <a href="%permissions">permissions</a> might be made available. Modules can automatically be temporarily disabled to reduce server load when your site becomes extremely busy by enabling the throttle.module and checking throttle. The auto-throttle functionality must be enabled on the <a href="%throttle">throttle configuration page</a> after having enabled the throttle module.</p>', array('%permissions' => url('admin/access/permissions'), '%throttle' => url('admin/settings/throttle')));
case 'admin/help#system':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment