diff --git a/LICENSE.md b/LICENSE.md index 2c79e0e9..1c0cf3d3 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -8,8 +8,10 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -All copyright notices and this permission notice shall be included in -all copies or substantial portions of the Software. +All copyright notices and permission notices (including this file) shall be +included and remain unedited in all copies or substantial portions of the +Software. This explicitly includes but is not limited to the Tinyboard copyright +notices found in the footers of some template files. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, @@ -17,4 +19,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file +THE SOFTWARE. diff --git a/install.php b/install.php index 6cd5f1fc..b14d8903 100644 --- a/install.php +++ b/install.php @@ -1,6 +1,6 @@ You are upgrading to a version which uses an amended license. The licenses included with Tinyboard distributions prior to this version (v0.9.4-dev-2) are still valid for those versions, but no longer apply to this and newer versions.

' . + ' +

+ I have read and understood the agreement. Proceed to upgrading. +

'; + break; + } + case false: // Update version number file_write($config['has_installed'], VERSION);