1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00

Merge branch 'ticket/igorw/9556' into develop

* ticket/igorw/9556:
  [ticket/9556] Drop php closing tags, add trailing newline

Conflicts:
	phpBB/includes/constants.php
This commit is contained in:
Nils Adermann
2010-12-13 16:35:55 +01:00
474 changed files with 274 additions and 737 deletions

View File

@@ -618,5 +618,3 @@ function validate_range($value_ary, &$error)
}
}
}
?>

View File

@@ -373,4 +373,4 @@
<!-- ENDIF -->
<!-- INCLUDE overall_footer.html -->
<!-- INCLUDE overall_footer.html -->

View File

@@ -121,4 +121,4 @@
</form>
<!-- INCLUDE overall_footer.html -->
<!-- INCLUDE overall_footer.html -->

View File

@@ -74,4 +74,4 @@
</form>
<!-- INCLUDE overall_footer.html -->
<!-- INCLUDE overall_footer.html -->

View File

@@ -252,4 +252,4 @@
<!-- ENDIF -->
<!-- INCLUDE overall_footer.html -->
<!-- INCLUDE overall_footer.html -->

View File

@@ -199,4 +199,4 @@
<!-- ENDIF -->
<!-- INCLUDE overall_footer.html -->
<!-- INCLUDE overall_footer.html -->

View File

@@ -354,4 +354,4 @@
<!-- ENDIF -->
<!-- INCLUDE overall_footer.html -->
<!-- INCLUDE overall_footer.html -->

View File

@@ -10,4 +10,4 @@
{PHPINFO}
</div>
<!-- INCLUDE overall_footer.html -->
<!-- INCLUDE overall_footer.html -->

View File

@@ -68,4 +68,4 @@ function iframe_updated()
//]]>
</script>
<!-- INCLUDE overall_footer.html -->
<!-- INCLUDE overall_footer.html -->

View File

@@ -49,4 +49,4 @@
<!-- ENDIF -->
<!-- INCLUDE overall_footer.html -->
<!-- INCLUDE overall_footer.html -->

View File

@@ -75,4 +75,4 @@
{S_FORM_TOKEN}
</fieldset>
</form>
</form>

View File

@@ -73,4 +73,4 @@
<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
</fieldset>
{S_FORM_TOKEN}
</form>
</form>

View File

@@ -155,4 +155,4 @@
{S_FORM_TOKEN}
</fieldset>
</form>
</form>

View File

@@ -63,4 +63,4 @@
<input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
{S_FORM_TOKEN}
</fieldset>
</form>
</form>

View File

@@ -114,4 +114,4 @@
<input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
{S_FORM_TOKEN}
</fieldset>
</form>
</form>

View File

@@ -75,4 +75,4 @@
</script>
</body>
</html>
</html>

View File

@@ -400,4 +400,4 @@ function getCaretPosition(txtarea)
}
return caretPos;
}
}

View File

@@ -131,4 +131,4 @@
</form>
<!-- ENDIF -->
<!-- INCLUDE install_footer.html -->
<!-- INCLUDE install_footer.html -->

View File

@@ -5,4 +5,4 @@
<p>{MESSAGE_TEXT}</p>
</div>
<!-- INCLUDE install_footer.html -->
<!-- INCLUDE install_footer.html -->

View File

@@ -24,4 +24,4 @@
</div>
</body>
</html>
</html>

View File

@@ -3,4 +3,4 @@
<h1>{TITLE}</h1>
<p>{BODY}</p>
<!-- INCLUDE install_footer.html -->
<!-- INCLUDE install_footer.html -->

View File

@@ -259,4 +259,4 @@ table.hrdiff caption span {
</div>
<!-- INCLUDE simple_footer.html -->
<!-- INCLUDE simple_footer.html -->

View File

@@ -5,4 +5,4 @@
<p>{MESSAGE_TEXT}</p>
</div>
<!-- INCLUDE overall_footer.html -->
<!-- INCLUDE overall_footer.html -->

View File

@@ -32,4 +32,4 @@
</div>
</body>
</html>
</html>

View File

@@ -35,4 +35,4 @@
<p>{L_ROLE_NOT_ASSIGNED}</p>
<!-- END role_mask -->
<!-- END role_mask -->

View File

@@ -37,4 +37,4 @@
// ]]>
</script>
<!-- INCLUDE simple_footer.html -->
<!-- INCLUDE simple_footer.html -->

View File

@@ -5,4 +5,4 @@
<p>{MESSAGE_TEXT}</p>
</div>
<!-- INCLUDE simple_footer.html -->
<!-- INCLUDE simple_footer.html -->

View File

@@ -18,4 +18,4 @@
</div>
</div>
</div>
<!-- INCLUDE simple_footer.html -->
<!-- INCLUDE simple_footer.html -->

View File

@@ -49,5 +49,3 @@ $template->assign_vars(array(
$template->display('body');
garbage_collection();
?>