From: Roland Mas
LinkAttachForm();?>
@@ -575,7 +575,7 @@ function showPostForm($thread_id=0, $is_followup_to=0, $subject="") {
into one...
X-Git-Tag: v5_2_rc1~383
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=962cad817b48dbeb7942e5edac04263fdd0ab643
Merged from Evolvis via 5.1: more XHTML fixes: Collapse one or more
into one
, br+p into just p
---
diff --git a/src/common/forum/ForumHTML.class.php b/src/common/forum/ForumHTML.class.php
index 29734ead1c..00f8446ed2 100644
--- a/src/common/forum/ForumHTML.class.php
+++ b/src/common/forum/ForumHTML.class.php
@@ -510,7 +510,7 @@ class ForumHTML extends Error {
-
+
-
+
-
+
enable_logging) {
echo "logging enabled, logged events below:
\n";
- echo (count($this->logfile) > 0) ? implode("
\n", $this->logfile) : "No logged events.";
+ echo (count($this->logfile) > 0) ? implode("
\n", $this->logfile) : "No logged events.";
}
}
diff --git a/src/common/tracker/actions/admin-ind.php b/src/common/tracker/actions/admin-ind.php
index dd7d687d12..adc26b3e92 100644
--- a/src/common/tracker/actions/admin-ind.php
+++ b/src/common/tracker/actions/admin-ind.php
@@ -144,7 +144,7 @@ if (!isset($at_arr) || !$at_arr || count($at_arr) < 1) {
:
-
:
'; @@ -101,14 +101,14 @@ function artifact_submission_form($ath, $group) {
- />
:
[commits.desc]
Log Message:
-
[log]+
Log Message:
[log]
' . _('Clicking "Send Lost PW Hash" below will email a URL to the email
-
'."\n";
echo ''.$fm->getSubject() .'';
if (!$reply) {
diff --git a/src/www/mail/admin/index.php b/src/www/mail/admin/index.php
index 8fe4987ad2..7fff1f9225 100644
--- a/src/www/mail/admin/index.php
+++ b/src/www/mail/admin/index.php
@@ -184,13 +184,13 @@ if ($group_id) {
@@ -222,7 +222,7 @@ if ($group_id) { isPublic() == MAIL__MAILING_LIST_IS_PRIVATE ? ' checked="checked"' : ''); ?> />
diff --git a/src/www/news/admin/index.php b/src/www/news/admin/index.php index 403935e702..eaa251eb70 100644 --- a/src/www/news/admin/index.php +++ b/src/www/news/admin/index.php @@ -157,7 +157,7 @@ details=$3 WHERE id=$4 AND group_id=$5", array($status, htmlspecialchars($summar unset($GLOBALS['editor_was_set_up']); echo '
- '.sprintf(_('If this item is on the %1$s home page and you edit it, it will be removed from the home page.'), forge_get_config ('forge_name')).'
'._('Skills profile for').' : '. db_result($result,0,'realname') .
' ('.db_result($result, 0, 'user_name') .
- ')
|