[geeklog-cvs] geeklog: Added config option multiple_breadcrumbs to turn off di...
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Wed Apr 25 10:54:18 EDT 2012
changeset 8625:12e4c93a52fa
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/12e4c93a52fa
user: Tom <websitemaster at cogeco.net>
date: Tue Apr 24 14:37:36 2012 -0400
description:
Added config option multiple_breadcrumbs to turn off displaying multiple breadcrumb trails for an object if available
diffstat:
language/english.php | 1 +
language/english_utf-8.php | 1 +
public_html/admin/install/config-install.php | 7 ++++---
public_html/docs/english/config.html | 4 ++++
sql/updates/mssql_1.8.1_to_2.0.0.php | 7 ++++---
sql/updates/mysql_1.8.1_to_2.0.0.php | 7 ++++---
sql/updates/pgsql_1.8.1_to_2.0.0.php | 7 ++++---
system/lib-topic.php | 6 +++++-
8 files changed, 27 insertions(+), 13 deletions(-)
diffs (127 lines):
diff -r 67f6783ca6c5 -r 12e4c93a52fa language/english.php
--- a/language/english.php Tue Apr 24 10:21:31 2012 -0400
+++ b/language/english.php Tue Apr 24 14:37:36 2012 -0400
@@ -2014,6 +2014,7 @@
'search_def_sort' => "Default Sort Order",
'autotag_permissions_story' => '[story: ] Permissions',
'autotag_permissions_user' => '[user: ] Permissions',
+ 'multiple_breadcrumbs' => "Multiple Breadcrumbs",
'disable_breadcrumbs_topics' => "Disable Topic Breadcrumbs",
'disable_breadcrumbs_articles' => "Disable Article Breadcrumbs",
'disable_breadcrumbs_plugins' => "Disable Plugins Breadcrumbs"
diff -r 67f6783ca6c5 -r 12e4c93a52fa language/english_utf-8.php
--- a/language/english_utf-8.php Tue Apr 24 10:21:31 2012 -0400
+++ b/language/english_utf-8.php Tue Apr 24 14:37:36 2012 -0400
@@ -2014,6 +2014,7 @@
'search_def_sort' => "Default Sort Order",
'autotag_permissions_story' => '[story: ] Permissions',
'autotag_permissions_user' => '[user: ] Permissions',
+ 'multiple_breadcrumbs' => "Multiple Breadcrumbs",
'disable_breadcrumbs_topics' => "Disable Topic Breadcrumbs",
'disable_breadcrumbs_articles' => "Disable Article Breadcrumbs",
'disable_breadcrumbs_plugins' => "Disable Plugins Breadcrumbs"
diff -r 67f6783ca6c5 -r 12e4c93a52fa public_html/admin/install/config-install.php
--- a/public_html/admin/install/config-install.php Tue Apr 24 10:21:31 2012 -0400
+++ b/public_html/admin/install/config-install.php Tue Apr 24 14:37:36 2012 -0400
@@ -425,9 +425,10 @@
$c->add('tab_topics', NULL, 'tab', 7, 45, NULL, 0, TRUE, $me, 45);
$c->add('fs_breadcrumbs', NULL, 'fieldset', 7, 45, NULL, 0, TRUE, $me, 45);
- $c->add('disable_breadcrumbs_topics', 0, 'select', 7, 45, 0, 2000, TRUE, $me, 45);
- $c->add('disable_breadcrumbs_articles', 0, 'select', 7, 45, 0, 2010, TRUE, $me, 45);
- $c->add('disable_breadcrumbs_plugins', 0, 'select', 7, 45, 0, 2020, TRUE, $me, 45);
+ $c->add('multiple_breadcrumbs', 1, 'select', 7, 45, 0, 2000, TRUE, $me, 45);
+ $c->add('disable_breadcrumbs_topics', 0, 'select', 7, 45, 0, 2010, TRUE, $me, 45);
+ $c->add('disable_breadcrumbs_articles', 0, 'select', 7, 45, 0, 2020, TRUE, $me, 45);
+ $c->add('disable_breadcrumbs_plugins', 0, 'select', 7, 45, 0, 2030, TRUE, $me, 45);
}
diff -r 67f6783ca6c5 -r 12e4c93a52fa public_html/docs/english/config.html
--- a/public_html/docs/english/config.html Tue Apr 24 10:21:31 2012 -0400
+++ b/public_html/docs/english/config.html Tue Apr 24 14:37:36 2012 -0400
@@ -1665,6 +1665,10 @@
<th style="width:29%">Default Value</th>
<th style="width:63%">Description</th></tr>
<tr>
+ <td valign="top"><a name="desc_multiple_breadcrumbs">multiple_breadcrumbs</a></td>
+ <td valign="top">true</td>
+ <td valign="top">Set this to <code>true</code> to allow multiple breadcrumbs to display if available.</td></tr>
+<tr>
<td valign="top"><a name="desc_disable_breadcrumbs_topics">disable_breadcrumbs_topics</a></td>
<td valign="top">false</td>
<td valign="top">Set this to <code>true</code> to disable topic breadcrumbs.</td></tr>
diff -r 67f6783ca6c5 -r 12e4c93a52fa sql/updates/mssql_1.8.1_to_2.0.0.php
--- a/sql/updates/mssql_1.8.1_to_2.0.0.php Tue Apr 24 10:21:31 2012 -0400
+++ b/sql/updates/mssql_1.8.1_to_2.0.0.php Tue Apr 24 14:37:36 2012 -0400
@@ -100,9 +100,10 @@
// Breadcrumbs
$c->add('tab_topics', NULL, 'tab', 7, 45, NULL, 0, TRUE, $me, 45);
$c->add('fs_breadcrumbs', NULL, 'fieldset', 7, 45, NULL, 0, TRUE, $me, 45);
- $c->add('disable_breadcrumbs_topics', 0, 'select', 7, 45, 0, 2000, TRUE, $me, 45);
- $c->add('disable_breadcrumbs_articles', 0, 'select', 7, 45, 0, 2010, TRUE, $me, 45);
- $c->add('disable_breadcrumbs_plugins', 0, 'select', 7, 45, 0, 2020, TRUE, $me, 45);
+ $c->add('multiple_breadcrumbs', 1, 'select', 7, 45, 0, 2000, TRUE, $me, 45);
+ $c->add('disable_breadcrumbs_topics', 0, 'select', 7, 45, 0, 2010, TRUE, $me, 45);
+ $c->add('disable_breadcrumbs_articles', 0, 'select', 7, 45, 0, 2020, TRUE, $me, 45);
+ $c->add('disable_breadcrumbs_plugins', 0, 'select', 7, 45, 0, 2030, TRUE, $me, 45);
// Password Update
$c->add('fs_pass', NULL, 'fieldset', 4, 42, NULL, 0, TRUE, $me, 18);
diff -r 67f6783ca6c5 -r 12e4c93a52fa sql/updates/mysql_1.8.1_to_2.0.0.php
--- a/sql/updates/mysql_1.8.1_to_2.0.0.php Tue Apr 24 10:21:31 2012 -0400
+++ b/sql/updates/mysql_1.8.1_to_2.0.0.php Tue Apr 24 14:37:36 2012 -0400
@@ -98,9 +98,10 @@
// Breadcrumbs
$c->add('tab_topics', NULL, 'tab', 7, 45, NULL, 0, TRUE, $me, 45);
$c->add('fs_breadcrumbs', NULL, 'fieldset', 7, 45, NULL, 0, TRUE, $me, 45);
- $c->add('disable_breadcrumbs_topics', 0, 'select', 7, 45, 0, 2000, TRUE, $me, 45);
- $c->add('disable_breadcrumbs_articles', 0, 'select', 7, 45, 0, 2010, TRUE, $me, 45);
- $c->add('disable_breadcrumbs_plugins', 0, 'select', 7, 45, 0, 2020, TRUE, $me, 45);
+ $c->add('multiple_breadcrumbs', 1, 'select', 7, 45, 0, 2000, TRUE, $me, 45);
+ $c->add('disable_breadcrumbs_topics', 0, 'select', 7, 45, 0, 2010, TRUE, $me, 45);
+ $c->add('disable_breadcrumbs_articles', 0, 'select', 7, 45, 0, 2020, TRUE, $me, 45);
+ $c->add('disable_breadcrumbs_plugins', 0, 'select', 7, 45, 0, 2030, TRUE, $me, 45);
// Max Link Text
$c->add('linktext_maxlen',50,'text',7,31,NULL,1754,TRUE, $me,31);
diff -r 67f6783ca6c5 -r 12e4c93a52fa sql/updates/pgsql_1.8.1_to_2.0.0.php
--- a/sql/updates/pgsql_1.8.1_to_2.0.0.php Tue Apr 24 10:21:31 2012 -0400
+++ b/sql/updates/pgsql_1.8.1_to_2.0.0.php Tue Apr 24 14:37:36 2012 -0400
@@ -100,9 +100,10 @@
// Breadcrumbs
$c->add('tab_topics', NULL, 'tab', 7, 45, NULL, 0, TRUE, $me, 45);
$c->add('fs_breadcrumbs', NULL, 'fieldset', 7, 45, NULL, 0, TRUE, $me, 45);
- $c->add('disable_breadcrumbs_topics', 0, 'select', 7, 45, 0, 2000, TRUE, $me, 45);
- $c->add('disable_breadcrumbs_articles', 0, 'select', 7, 45, 0, 2010, TRUE, $me, 45);
- $c->add('disable_breadcrumbs_plugins', 0, 'select', 7, 45, 0, 2020, TRUE, $me, 45);
+ $c->add('multiple_breadcrumbs', 1, 'select', 7, 45, 0, 2000, TRUE, $me, 45);
+ $c->add('disable_breadcrumbs_topics', 0, 'select', 7, 45, 0, 2010, TRUE, $me, 45);
+ $c->add('disable_breadcrumbs_articles', 0, 'select', 7, 45, 0, 2020, TRUE, $me, 45);
+ $c->add('disable_breadcrumbs_plugins', 0, 'select', 7, 45, 0, 2030, TRUE, $me, 45);
// Max Link Text
$c->add('linktext_maxlen',50,'text',7,31,NULL,1754,TRUE, $me,31);
diff -r 67f6783ca6c5 -r 12e4c93a52fa system/lib-topic.php
--- a/system/lib-topic.php Tue Apr 24 10:21:31 2012 -0400
+++ b/system/lib-topic.php Tue Apr 24 14:37:36 2012 -0400
@@ -1272,7 +1272,7 @@
*/
function TOPIC_breadcrumbs($type, $id)
{
- global $_CONF, $_TABLES, $LANG27, $_TOPICS;
+ global $_CONF, $_TABLES, $LANG27, $_TOPICS, $topic;
$breadcrumbs_output = '';
@@ -1296,6 +1296,10 @@
// Retrieve all topics assignments that point to this object
$sql = "SELECT ta.tid FROM {$_TABLES['topic_assignments']} ta, {$_TABLES['topics']} t
WHERE ta.type = '{$type}' AND ta.id = '{$id}' and t.tid = ta.tid" . COM_getPermSQL('AND', 0, 2, 't');
+
+ if (!$_CONF['multiple_breadcrumbs']) {
+ $sql .= " AND ta.tid = '{$topic}'";
+ }
}
$result = DB_query($sql);
$nrows = DB_numRows($result);
More information about the geeklog-cvs
mailing list