This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 198e907ca0dc8597eb303c277a16851475492e6e (commit)
via 84ca71938f8a67d0467d986d5aad460a4a96894b (commit)
from f676b296a131cc52b1c481f5d19c0a5043c80ed2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=198e907ca0dc8597eb303c277a16851475492e6e
commit 198e907ca0dc8597eb303c277a16851475492e6e
Author: Marc-Etienne Vargenau <[email protected]>
Date: Wed Dec 18 18:18:24 2019 +0100
Whitespace
diff --git a/src/www/admin/pending-diary.php b/src/www/admin/pending-diary.php
index 76aad79..017d67f 100644
--- a/src/www/admin/pending-diary.php
+++ b/src/www/admin/pending-diary.php
@@ -54,7 +54,7 @@ $res = db_query_params('SELECT user_diary.id FROM user_diary,
users
AND date_posted > $4
ORDER BY date_posted',
array(1, 0, 'A', $old_date));
-
+
if ($res && db_numrows($res)) {
echo html_e('h2', array(), _('Available diary entries eligible to
frontpage'));
$title_arr = array('', _('Date'), _('Subject'), _('User'),
_('Actions'));
@@ -81,7 +81,7 @@ $res = db_query_params('SELECT user_diary.id FROM user_diary,
users
AND date_posted > $3
ORDER BY date_posted',
array(1, 1, $old_date));
-
+
if ($res && db_numrows($res)) {
echo html_e('h2', array(), _('Published diary entries to frontpage last
30 days.'));
$title_arr = array('', _('Date'), _('Subject'), _('User'),
_('Actions'));
@@ -109,7 +109,7 @@ $res = db_query_params('SELECT user_diary.id FROM
user_diary, users
AND date_posted > $3
ORDER BY date_posted',
array(1, 2, $old_date));
-
+
if ($res && db_numrows($res)) {
echo html_e('h2', array(), _('Refused diary entries to frontpage last
30 days.'));
$title_arr = array('', _('Date'), _('Subject'), _('User'),
_('Actions'));
diff --git a/src/www/project/index.php b/src/www/project/index.php
index fc05b86..253ef8d 100644
--- a/src/www/project/index.php
+++ b/src/www/project/index.php
@@ -38,7 +38,7 @@ session_require_perm('project_read', $group_id);
if ($g->isError())
exit_error($g->getErrorMessage(), 'home');
-
+
/* everything sounds ok, now let's do the job */
$action = getStringFromRequest('action');
if
(file_exists(forge_get_config('source_path').'/common/project/actions/'.$action.'.php'))
{
diff --git a/src/www/search/include/SearchManager.class.php
b/src/www/search/include/SearchManager.class.php
index f01d846..99c5ded 100644
--- a/src/www/search/include/SearchManager.class.php
+++ b/src/www/search/include/SearchManager.class.php
@@ -164,7 +164,7 @@ class SearchManager {
SEARCH__TYPE_IS_ALLDOCS,
$ffSEAllDocs
);
-
+
if (forge_get_config('use_people')) {
$ffSESkills = new GFSearchEngine(SEARCH__TYPE_IS_SKILL,
'SkillHtmlSearchRenderer', _('Skills'));
$this->addSearchEngine(
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=84ca71938f8a67d0467d986d5aad460a4a96894b
commit 84ca71938f8a67d0467d986d5aad460a4a96894b
Author: Marc-Etienne Vargenau <[email protected]>
Date: Wed Dec 18 18:16:56 2019 +0100
Whitespace
diff --git a/src/common/diary/views/detail.php
b/src/common/diary/views/detail.php
index 79e8821..e4beac7 100644
--- a/src/common/diary/views/detail.php
+++ b/src/common/diary/views/detail.php
@@ -34,4 +34,4 @@ include ($gfcommon.'diary/views/detailnote.php');
echo html_ac(html_ap() - 1);
echo html_ao('div', array('id' => 'diary_right'));
include ($gfcommon.'diary/views/archive.php');
-echo html_ac(html_ap() - 2);
+echo html_ac(html_ap() - 2);
diff --git a/src/common/project/actions/pointer_down.php
b/src/common/project/actions/pointer_down.php
index 06237bb..f8e5f1c 100644
--- a/src/common/project/actions/pointer_down.php
+++ b/src/common/project/actions/pointer_down.php
@@ -25,7 +25,7 @@ global $group_id;
global $g;
session_require_perm('project_read', $group_id);
-
+
if ($g->castVote(false)) {
$feedback = _('Retracted Vote successfully');
} else {
diff --git a/src/common/project/actions/pointer_up.php
b/src/common/project/actions/pointer_up.php
index 3ce022b..351e25e 100644
--- a/src/common/project/actions/pointer_up.php
+++ b/src/common/project/actions/pointer_up.php
@@ -20,12 +20,12 @@
* with FusionForge; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
global $group_id;
global $g;
session_require_perm('project_read', $group_id);
-
+
if ($g->castVote()) {
$feedback = _('Cast Vote successfully');
} else {
diff --git a/src/common/widget/Widget_HomeSponsoredHeadLines.class.php
b/src/common/widget/Widget_HomeSponsoredHeadLines.class.php
index 938c33b..a35d297 100644
--- a/src/common/widget/Widget_HomeSponsoredHeadLines.class.php
+++ b/src/common/widget/Widget_HomeSponsoredHeadLines.class.php
@@ -97,4 +97,3 @@ class Widget_HomeSponsoredHeadLines extends Widget {
return $HTML->warning_msg(_('No Sponsored element found'));
}
}
-
-----------------------------------------------------------------------
Summary of changes:
src/common/diary/views/detail.php | 2 +-
src/common/project/actions/pointer_down.php | 2 +-
src/common/project/actions/pointer_up.php | 4 ++--
src/common/widget/Widget_HomeSponsoredHeadLines.class.php | 1 -
src/www/admin/pending-diary.php | 6 +++---
src/www/project/index.php | 2 +-
src/www/search/include/SearchManager.class.php | 2 +-
7 files changed, 9 insertions(+), 10 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
