Skip to content

Commit 77249ef

Browse files
Housekeeping updates for 2.2 announcement version (calling it 2.2.2)
1 parent 88f809a commit 77249ef

File tree

8 files changed

+18
-9
lines changed

8 files changed

+18
-9
lines changed

README.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ http://processwire.com
1414
Download ProcessWire at:
1515
http://github.com/ryancramerdesign/ProcessWire
1616

17-
Follow ProcessWire on Twitter at:
17+
Follow ProcessWire on Twitter at @processwire
1818
http://twitter.com/processwire/
1919

2020

@@ -69,6 +69,9 @@ does not contain any files specific to your site, only to ProcessWire.
6969
All the files specific to your site are stored in /site/ and you would
7070
leave that directory alone during an upgrade.
7171

72+
After upgrading, you may get an error on the first web request you try,
73+
but that should only happen once, so just reload the page.
74+
7275
If you are interested, this process is outlined in more detail in our
7376
upgrade FAQ:
7477

site-default/config.php

-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@
110110
*/
111111
$config->adminEmail = '';
112112

113-
114113
/**
115114
* Prefix to use in page URLs for page numbers, i.e. a prefix of 'page' would use 'page1', 'page2', etc.
116115
*

wire/config.php

+7
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,10 @@
6464
*/
6565
$config->dateFormat = 'Y-m-d H:i:s';
6666

67+
/**
68+
* protectCSRF: enables CSRF (cross site request forgery) protection on all PW forms,
69+
* recommended for improved security.
70+
*
71+
*/
72+
$config->protectCSRF = true;
73+

wire/core/ProcessWire.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class ProcessWire extends Wire {
3535

3636
const versionMajor = 2;
3737
const versionMinor = 2;
38-
const versionRevision = 0;
38+
const versionRevision = 2;
3939

4040
/**
4141
* Given a Config object, instantiates ProcessWire and it's API

wire/modules/Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ class FieldtypeRepeater extends Fieldtype implements ConfigurableModule {
2323
public static function getModuleInfo() {
2424
return array(
2525
'title' => __('Repeater', __FILE__), // Module Title
26-
'summary' => __('Maintains a collection of fields that are repeated for any number of times. BETA TEST ONLY, NOT FOR PRODUCTION USE.', __FILE__), // Module Summary
27-
'version' => 001,
26+
'summary' => __('Maintains a collection of fields that are repeated for any number of times.', __FILE__), // Module Summary
27+
'version' => 100,
2828
'autoload' => true,
2929
'installs' => 'InputfieldRepeater'
3030
);

wire/modules/Fieldtype/FieldtypeRepeater/InputfieldRepeater.module

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ class InputfieldRepeater extends Inputfield {
2323
public static function getModuleInfo() {
2424
return array(
2525
'title' => __('Repeater', __FILE__), // Module Title
26-
'summary' => __('Repeats fields from another template. Provides the input for FieldtypeRepeater. BETA TEST ONLY, NOT FOR PRODUCTION USE.', __FILE__), // Module Summary
27-
'version' => 001,
26+
'summary' => __('Repeats fields from another template. Provides the input for FieldtypeRepeater.', __FILE__), // Module Summary
27+
'version' => 100,
2828
'requires' => 'FieldtypeRepeater',
2929
);
3030
}

wire/modules/Inputfield/InputfieldPassword.module

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class InputfieldPassword extends InputfieldText {
3131
if($trackChanges) $this->setTrackChanges(false);
3232
$this->attr('value', '');
3333
$out = "\n<p><input " . $this->getAttributesString() . " /></p>" .
34-
"\n<p><input type='password' size='{$this->size}' name='_{$this->name}' value='' /> " . $this->_('(confirm)') . "</p>";
34+
"\n<p><input type='password' size='{$this->size}' name='_{$this->name}' value='' /> <span class='detail'>" . $this->_('(confirm)') . "</span></p>";
3535
$this->attr('value', $value);
3636
if($trackChanges) $this->setTrackChanges(true);
3737
return $out;

wire/templates-admin/default.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139

140140
<?php endif; ?>
141141

142-
ProcessWire <?php echo $config->version . '.' . $config->systemVersion; ?> &copy; <?php echo date("Y"); ?> Ryan Cramer
142+
ProcessWire <?php echo $config->version . ' <!--v' . $config->systemVersion; ?>--> &copy; <?php echo date("Y"); ?> Ryan Cramer
143143
</p>
144144

145145
<?php if($config->debug && $this->user->isSuperuser()) include($config->paths->adminTemplates . "debug.inc"); ?>

0 commit comments

Comments
 (0)