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 d8e4a9317533e18efd7355296d381a94b3ef6039 (commit)
from e1a87994a213af1b08d04ab05a3d2c974a18cf18 (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=d8e4a9317533e18efd7355296d381a94b3ef6039
commit d8e4a9317533e18efd7355296d381a94b3ef6039
Author: Franck Villaume <[email protected]>
Date: Sat May 11 13:54:12 2019 +0200
use diaryNote Object getLink function when appropriate
diff --git a/src/common/diary/views/listnotes.php
b/src/common/diary/views/listnotes.php
index c545a23..2e1ddfc 100644
--- a/src/common/diary/views/listnotes.php
+++ b/src/common/diary/views/listnotes.php
@@ -41,14 +41,14 @@ if ($diaryNoteFactoryObject->hasNotes(1)) {
if ($year && $month) {
foreach
($diaryNoteFactoryObject->getDIaryNoteIDsByYearAndMonth($year, $month, 1) as
$diarynoteid) {
$cells = array();
- $cells[][] =
util_make_link('/developer/?view=detail&diary_id='.$diarynoteid.'&diary_user='.
$diary_user, $diaryNoteFactoryObject->getDiaryNote($diarynoteid)->getSummary());
+ $cells[][] =
util_make_link($diaryNoteFactoryObject->getDiaryNote($diarynoteid)->getLink(),
$diaryNoteFactoryObject->getDiaryNote($diarynoteid)->getSummary());
$cells[][] =
$diaryNoteFactoryObject->getDiaryNote($diarynoteid)->getDatePostedOn();
echo $HTML->multiTableRow(array(), $cells);
}
} else {
foreach ($diaryNoteFactoryObject->getDiaryNoteIDs(1, 10) as
$diarynoteid) {
$cells = array();
- $cells[][] =
util_make_link('/developer/?view=detail&diary_id='.$diarynoteid.'&diary_user='.
$diary_user, $diaryNoteFactoryObject->getDiaryNote($diarynoteid)->getSummary());
+ $cells[][] =
util_make_link($diaryNoteFactoryObject->getDiaryNote($diarynoteid)->getLink(),
$diaryNoteFactoryObject->getDiaryNote($diarynoteid)->getSummary());
$cells[][] =
$diaryNoteFactoryObject->getDiaryNote($diarynoteid)->getDatePostedOn();
echo $HTML->multiTableRow(array(), $cells);
}
diff --git a/src/common/include/utils_crossref.php
b/src/common/include/utils_crossref.php
index bec7542..0610c62a 100644
--- a/src/common/include/utils_crossref.php
+++ b/src/common/include/utils_crossref.php
@@ -164,7 +164,7 @@ function _diarynotesid2url($id) {
$text = '[N'.$id.']';
$dn = diarynote_get_object($id);
if ($dn && is_object($dn) && !$dn->isError() && $dn->isPublic()) {
- $url =
'/developer/?view=detail&diary_id='.$id.'&diary_user='.$dn->getUser()->getID();
+ $url = $dn->getLink();
$arg['title'] = $dn->getSummary();
return util_make_link($url, $text, $arg);
}
diff --git a/src/common/widget/Widget_HomeLatestDiaryNotes.class.php
b/src/common/widget/Widget_HomeLatestDiaryNotes.class.php
index 918d47d..b366e25 100644
--- a/src/common/widget/Widget_HomeLatestDiaryNotes.class.php
+++ b/src/common/widget/Widget_HomeLatestDiaryNotes.class.php
@@ -53,7 +53,7 @@ class Widget_HomeLatestDiaryNotes extends Widget {
foreach ($diaryFactory->getDiaryNoteIDs(1) as $key =>
$diarynoteid) {
if ($key < 5) {
$cells = array();
- $cells[][] =
util_make_link('/developer/?diary_id='.$diarynoteid.'&view=detail&diary_user='.
$diaryFactory->getDiaryNote($diarynoteid)->getUser()->getID(),
$diaryFactory->getDiaryNote($diarynoteid)->getSummary());
+ $cells[][] =
util_make_link($diaryFactory->getDiaryNote($diarynoteid)->getLink(),
$diaryFactory->getDiaryNote($diarynoteid)->getSummary());
$cells[][] =
$diaryFactory->getDiaryNote($diarynoteid)->getDatePostedOn();
$cells[][] =
util_display_user($diaryFactory->getDiaryNote($diarynoteid)->getUser()->getUnixName(),
$diaryFactory->getDiaryNote($diarynoteid)->getUser()->getID(),
$diaryFactory->getDiaryNote($diarynoteid)->getUser()->getRealName());
$content .=
$HTML->multiTableRow(array(), $cells);
diff --git a/src/www/admin/pending-diary.php b/src/www/admin/pending-diary.php
index faa5420..76aad79 100644
--- a/src/www/admin/pending-diary.php
+++ b/src/www/admin/pending-diary.php
@@ -64,7 +64,7 @@ if ($res && db_numrows($res)) {
$cells = array();
$cells[][] = $HTML->html_checkbox('diary_approved_id',
$arr['id'], 'diary_approved_id');
$cells[][] = $diarynoteObject->getDatePostedOn();
- $cells[][] =
util_make_link('/developer/?view=detail&diary_user='.$diarynoteObject->getUser()->getID().'&diary_id='.$arr['id'],$diarynoteObject->getSummary());
+ $cells[][] = util_make_link($diarynoteObject->getLink(),
$diarynoteObject->getSummary());
$cells[][] = $diarynoteObject->getUser()->getUnixname();
$cells[][] =
util_make_link('/admin/pending-diary.php?post_change=add&diary_id='.$arr['id'],
$HTML->getAddPic());
echo $HTML->multiTableRow(array(), $cells);
@@ -91,7 +91,7 @@ if ($res && db_numrows($res)) {
$cells = array();
$cells[][] = $HTML->html_checkbox('diary_approved_id',
$arr['id'], 'diary_approved_id');
$cells[][] = $diarynoteObject->getDatePostedOn();
- $cells[][] =
util_make_link('/developer/?view=detail&diary_user='.$diarynoteObject->getUser()->getID().'&diary_id='.$arr['id'],$diarynoteObject->getSummary());
+ $cells[][] = util_make_link($diarynoteObject->getLink(),
$diarynoteObject->getSummary());
$cells[][] = $diarynoteObject->getUser()->getUnixname();
$cells[][] =
util_make_link('/admin/pending-diary.php?post_change=remove&diary_id='.$arr['id'],
$HTML->getRemovePic());
echo $HTML->multiTableRow(array(), $cells);
@@ -119,7 +119,7 @@ if ($res && db_numrows($res)) {
$cells = array();
$cells[][] = $HTML->html_checkbox('diary_approved_id',
$arr['id'], 'diary_approved_id');
$cells[][] = $diarynoteObject->getDatePostedOn();
- $cells[][] =
util_make_link('/developer/?view=detail&diary_user='.$diarynoteObject->getUser()->getID().'&diary_id='.$arr['id'],$diarynoteObject->getSummary());
+ $cells[][] = util_make_link($diarynoteObject->getLink(),
$diarynoteObject->getSummary());
$cells[][] = $diarynoteObject->getUser()->getUnixname();
$cells[][] =
util_make_link('/admin/pending-diary.php?post_change=add&diary_id='.$arr['id'],
$HTML->getAddPic());
echo $HTML->multiTableRow(array(), $cells);
-----------------------------------------------------------------------
Summary of changes:
src/common/diary/views/listnotes.php | 4 ++--
src/common/include/utils_crossref.php | 2 +-
src/common/widget/Widget_HomeLatestDiaryNotes.class.php | 2 +-
src/www/admin/pending-diary.php | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
