Hi!
1- Since this is in trunk (and will be part of 3.0), shouldn't
trunk/db/tiki_2.0to3.0.sql be modified instead of
trunk/db/tiki_1.9to2.0.sql?
2- Is trunk/db/profiles/default-inserts.sql still useful with the recent
changes (now that we have lib/setup/prefs.php)?
Thanks!
--
M ;-)
//////////////////////////////////////////////////////////////////////
/ /
/ Marc Laporte <|>
http://marclaporte.com /
/ Avantech.net <|>
http://avantech.net /
/ TikiWiki CMS/Groupware <|>
http://tikiwiki.org/UserPagemarclaporte /
/ /
//////////////////////////////////////////////////////////////////////
-----Original Message-----
From:
m_stef@... [mailto:
m_stef@...]
Sent: July 19, 2008 7:58 PM
To:
tikiwiki-cvs@...
Subject: [Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[13749] trunk
Revision: 13749
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13749&view=revAuthor: m_stef
Date: 2008-07-19 23:57:28 +0000 (Sat, 19 Jul 2008)
Log Message:
-----------
[ENH] added support for paged posts in tiki blog RSS.
Modified Paths:
--------------
trunk/db/profiles/default-inserts.sql
trunk/db/tiki_1.9to2.0.sql
trunk/templates/tiki-admin-include-rss.tpl
trunk/tiki-admin_include_rss.php
trunk/tiki-blogs_rss.php
Modified: trunk/db/profiles/default-inserts.sql
===================================================================
--- trunk/db/profiles/default-inserts.sql 2008-07-19 11:02:34 UTC (rev
13748)
+++ trunk/db/profiles/default-inserts.sql 2008-07-19 23:57:28 UTC (rev
13749)
@@ -229,6 +229,7 @@
INSERT INTO tiki_preferences VALUES ('max_rss_articles','10'); INSERT INTO
tiki_preferences VALUES ('max_rss_blog','10'); INSERT INTO tiki_preferences
VALUES ('max_rss_blogs','10');
+INSERT INTO tiki_preferences VALUES ('summary_rss_blogs','n');
INSERT INTO tiki_preferences VALUES ('max_rss_file_galleries','10');
INSERT INTO tiki_preferences VALUES ('max_rss_file_gallery','10'); INSERT
INTO tiki_preferences VALUES ('max_rss_forum','10');
Modified: trunk/db/tiki_1.9to2.0.sql
===================================================================
--- trunk/db/tiki_1.9to2.0.sql 2008-07-19 11:02:34 UTC (rev 13748)
+++ trunk/db/tiki_1.9to2.0.sql 2008-07-19 23:57:28 UTC (rev 13749)
@@ -1788,3 +1788,6 @@
#2008-07-11 nyloth
UPDATE `tiki_preferences` SET `value`='n' WHERE `name`='feature_wysiwyg'
AND `value`='default';
+
+#2008-07-20 mstef
+insert into tiki_preferences (name, value) values
+('summary_rss_blogs','n');
Modified: trunk/templates/tiki-admin-include-rss.tpl
===================================================================
--- trunk/templates/tiki-admin-include-rss.tpl 2008-07-19 11:02:34 UTC (rev
13748)
+++ trunk/templates/tiki-admin-include-rss.tpl 2008-07-19 23:57:28 UTC (rev
13749)
@@ -22,7 +22,7 @@
<td width="20"><input type="checkbox" name="rss_blogs"
onclick="flip('blogsrss');"{if $prefs.rss_blogs eq 'y'}
checked="checked"{/if}{if $prefs.feature_blogs ne 'y'}
disabled="disabled"{/if} /></td>
<td class="form" colspan="2">{if $prefs.rss_blogs eq 'y'}<a
href="tiki-blogs_rss.php" title="{tr}Feed for
blogs{/tr}.">{/if}{tr}Blogs{/tr}{if $prefs.rss_blogs eq 'y'}</a>{/if} {if
$prefs.feature_blogs ne 'y'} ({tr}Feature is disabled.{/tr} <a
href="tiki-admin.php?page=features" title="{tr}Features{/tr}">{tr}Enable
now{/tr}</a>.){/if}
<div id="blogsrss" style="display:{if ($prefs.rss_blogs eq 'y')
and ($prefs.feature_blogs eq 'y')}block{else}none{/if};">
- <p>{tr}Title{/tr}: <input type="text" name="title_rss_blogs"
size="20" maxlength="255" style="width:95%"
value='{$prefs.title_rss_blogs|escape}' /><br />{tr}Description{/tr}:
<textarea name="desc_rss_blogs" style="width:95%" cols="20"
rows="2">{$prefs.desc_rss_blogs|escape}</textarea><br />{tr}Maximum number
of items to display{/tr}:<input type="text" name="max_rss_blogs" size="5"
value="{$prefs.max_rss_blogs|escape}" /></p>
+ <p>{tr}Title{/tr}: <input type="text"
+ name="title_rss_blogs" size="20" maxlength="255" style="width:95%"
value='{$prefs.title_rss_blogs|escape}' /><br />{tr}Description{/tr}:
<textarea name="desc_rss_blogs" style="width:95%" cols="20"
rows="2">{$prefs.desc_rss_blogs|escape}</textarea><br />{tr}Maximum number
of items to display{/tr}:<input type="text" name="max_rss_blogs" size="5"
value="{$prefs.max_rss_blogs|escape}" /><br />{tr}Only first
page{/tr}:<input type="checkbox" name="summary_rss_blogs"
onclick="flip('summaryrssblogs');"{if $prefs.summary_rss_blogs eq 'y'}
checked="checked"{/if} /></p>
</div>
</td>
</tr>
Modified: trunk/tiki-admin_include_rss.php
===================================================================
--- trunk/tiki-admin_include_rss.php 2008-07-19 11:02:34 UTC (rev 13748)
+++ trunk/tiki-admin_include_rss.php 2008-07-19 23:57:28 UTC (rev 13749)
@@ -34,6 +34,7 @@
simple_set_value('rssfeed_webmaster');
simple_set_value('rss_cache_time');
simple_set_value('rssfeed_img');
+ simple_set_toggle('summary_rss_blogs');
}
ask_ticket('admin-inc-rss');
Modified: trunk/tiki-blogs_rss.php
===================================================================
--- trunk/tiki-blogs_rss.php 2008-07-19 11:02:34 UTC (rev 13748)
+++ trunk/tiki-blogs_rss.php 2008-07-19 23:57:28 UTC (rev 13749)
@@ -43,7 +43,12 @@
$changes = $bloglib -> list_all_blog_posts(0,
$prefs['max_rss_blogs'], $dateId.'_desc', '', $now);
$tmp = array();
foreach ($changes["data"] as $data) {
- $data["$descId"] = $tikilib->parse_data($data["$descId"]);
+ global $bloglib;
+ if($prefs['summary_rss_blogs'] == "y") {
+ $data["$descId"] =
$tikilib->parse_data($bloglib->get_page($data["$descId"],1));
+ } else {
+ $data["$descId"] = $tikilib->parse_data($data["$descId"]);
+ }
$tmp[] = $data;
}
$changes["data"] = $tmp;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great
prizes Grand prize is a trip for two to an Open Source event anywhere in the
world
http://moblin-contest.org/redirect.php?banner_id=100&url=/_______________________________________________
Tikiwiki-cvs mailing list
Tikiwiki-cvs@...
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/_______________________________________________
Tikiwiki-devel mailing list
Tikiwiki-devel@...
https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
