Skip to content

Commit 07551a7

Browse files
committed
Updated PyroCMS version to 2.2
This got reverted in the merge. I also switched any references to use `{{ variables:get_var name='pyrocms_version' }}` instead. This allows the one place of changing it in the config.
1 parent 4a2cb9b commit 07551a7

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

Diff for: assets/embeds/header.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ <h3><a href=""><img src="assets/img/logo.png" /></a></h3>
4848

4949
<div id="box">
5050

51-
<div class="breadcrumbs"><strong>PyroCMS 2.1</strong> | {{ breadcrumbs:crumbs }}</div>
51+
<div class="breadcrumbs"><strong>PyroCMS {{ variables:get_var name="pyrocms_version" }}</strong> | {{ breadcrumbs:crumbs }}</div>
5252

5353
<div id="menu">
5454

Diff for: config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
*/
1919

2020
// The current PyroCMS version
21-
$config['pyrocms_version'] = '2.1.0';
21+
$config['pyrocms_version'] = '2.2';

Diff for: content/developers/contributing/coding-standards.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ String concatenation should not contain spaces around the joined parts.
250250
## Documentation
251251
Having a good API documentation is a vital requirement for any successful project. When building your module, please take the time to document its code or even write help articles on it (but that is a different story).
252252

253-
Most of PyroCMS' core components [are documented](http://docs.pyrocms.com/2.1/api/) and add-ons are actually expected to keep up by at least having each of their files declare the respective package they belong to. Anything can be documented except for views. Classes and functions should be documented using the standard PHPDoc format.
253+
Most of PyroCMS' core components <a href="/{{ variables:get_var name='pyrocms_version' }}/api/">are documented</a> and add-ons are actually expected to keep up by at least having each of their files declare the respective package they belong to. Anything can be documented except for views. Classes and functions should be documented using the standard PHPDoc format.
254254

255255
The actual API Documentation is being generated by [DocBlox](http://www.docblox-project.org/). This gives the ability to reflect the HMVC approach used in building PyroCMS into the actual API documentation. This is how the API Documentation packages are structured in PyroCMS:
256256

Diff for: content/developers/contributing/using-git.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Go to out [GitHub Repository](http://github.com/pyrocms/pyrocms/) and click "For
1212

1313
You will be set up with a new repository which is a copy of ours. That means you can work on your copy of our repository without us needing to give you access to anything. You can use the following command to get a copy on your computer in your current directory. Best to put this into htdocs (or somewhere you have a server/domains's document root set).
1414

15-
git clone [email protected]:yourusername/pyrocms.git -b 2.1/develop
15+
git clone [email protected]:yourusername/pyrocms.git -b {{ variables:get_var name="pyrocms_version" }}/develop
1616

1717
Now you can edit away on the source code and everything is tracked. When you commit your work *please* commit carefully and do not send us your config.php or database.php files in the changes.
1818

@@ -25,8 +25,8 @@ To make a pull request, see the [GitHub pull request guide](https://help.github.
2525
Even if you have a copy of our repository then you are basically taking a snapshot of our repository as it is at the time. If we push new commits you will miss out entirely unless you add us as another remote (this works for either workflow).
2626

2727
git remote add pyrocms git://github.com/pyrocms/pyrocms.git
28-
git pull pyrocms 2.1/develop
29-
git push origin 2.1/develop
28+
git pull pyrocms {{ variables:get_var name="pyrocms_version" }}/develop
29+
git push origin {{ variables:get_var name="pyrocms_version" }}/develop
3030

3131
That will take any new commits from the main PyroCMS repository and push them to your own repository.
3232

Diff for: content/developers/tools/keywords.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ You can return an array or a string of the keywords with the following methods:
5454

5555
"keyword_1, keyword_2, keyword_3"
5656

57-
For more on usage see the [API Documentation: Keywords](/2.1/api/classes/Keywords.html).
57+
For more on usage see the <a href="/{{ variables:get_var name='pyrocms_version' }}/api/classes/Keywords.html">API Documentation: Keywords</a>.

Diff for: content/setup/installation.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The first step in getting up and running with PyroCMS is downloading a copy of t
44

55
## Downloading PyroCMS Manually
66

7-
You can download the latest 2.1.x version of PyroCMS <a href="https://github.com/pyrocms/pyrocms/zipball/2.1/master">here</a>. Extract the files from the zip and copy or upload them to your webserver or development environment.
7+
You can download the latest version of PyroCMS <a href="https://github.com/pyrocms/pyrocms/zipball/{{ variables:get_var name='pyrocms_version' }}/master">here</a>. Extract the files from the zip and copy or upload them to your webserver or development environment.
88

99
## Downloading PyroCMS using Git
1010

0 commit comments

Comments
 (0)