Commit 5b39f676 authored by Dries's avatar Dries

* Applied slightly modified version of Marco's taxonomy patch:

 - Fixed a bug with get_tree and multiple parents.
 - Fixed 3 wrong caches (this will avoid some queries).
 - Extension to taxonomy_term_count_nodes() (feature #159): "currently
   calling taxonomy_term_count_nodes() returns the amount of nodes in each
   term, would it be possible to extend this function so that it would only
   return the amount of nodes of a certain type under each term.
 - Confirm deleting a vocabulary or a term (requested by Moshe).
 - Use form_weight() in vocabulary and term forms.
 - After submitting a term, we end up at the term page (requested by Moshe).
 - Added status messages when adding, editing and deleting vocabularies and
   terms
 - Minor clean ups

* Made sure all modules use the same link delimiter; "|" for now.
parent ab143d68
......@@ -272,7 +272,7 @@ function block_admin() {
$links[] = la(t("preview"), array("mod" => "block", "op" => "preview"));
$links[] = la(t("help"), array("mod" => "block", "op" => "help"));
print "<small>". $theme->links($links) ."</small><hr />";
print "<small>". implode(" | ", $links) ."</small><hr />";
switch ($op) {
case "help":
......
......@@ -272,7 +272,7 @@ function block_admin() {
$links[] = la(t("preview"), array("mod" => "block", "op" => "preview"));
$links[] = la(t("help"), array("mod" => "block", "op" => "help"));
print "<small>". $theme->links($links) ."</small><hr />";
print "<small>". implode(" | ", $links) ."</small><hr />";
switch ($op) {
case "help":
......
......@@ -729,7 +729,7 @@ function book_admin() {
$links = book_admin_links();
print "<small>". implode(" &middot; ", $links) ."</small><hr />";
print "<small>". implode(" | ", $links) ."</small><hr />";
switch ($op) {
case t("Edit book outline"):
......
......@@ -729,7 +729,7 @@ function book_admin() {
$links = book_admin_links();
print "<small>". implode(" &middot; ", $links) ."</small><hr />";
print "<small>". implode(" | ", $links) ."</small><hr />";
switch ($op) {
case t("Edit book outline"):
......
......@@ -301,7 +301,7 @@ function comment_links($comment, $return = 1) {
global $user, $theme;
$links = array();
/*
** If we are viewing just this comment, we link back to the node
*/
......
......@@ -301,7 +301,7 @@ function comment_links($comment, $return = 1) {
global $user, $theme;
$links = array();
/*
** If we are viewing just this comment, we link back to the node
*/
......
......@@ -323,7 +323,7 @@ function forum_get_forums($tid = 0) {
if (!$forums) {
$forums = array();
taxonomy_get_tree(variable_get("forum_nav_vocabulary", ""), $_forums, $tid);
$_forums = taxonomy_get_tree(variable_get("forum_nav_vocabulary", ""), $tid);
$n = 0;
foreach ($_forums as $forum) {
if (in_array($forum->tid, variable_get("forum_containers", array()))) {
......
......@@ -323,7 +323,7 @@ function forum_get_forums($tid = 0) {
if (!$forums) {
$forums = array();
taxonomy_get_tree(variable_get("forum_nav_vocabulary", ""), $_forums, $tid);
$_forums = taxonomy_get_tree(variable_get("forum_nav_vocabulary", ""), $tid);
$n = 0;
foreach ($_forums as $forum) {
if (in_array($forum->tid, variable_get("forum_containers", array()))) {
......
......@@ -22,7 +22,7 @@ function help_admin() {
}
}
print "<small>". implode(" - ", $links) ."</small><hr />";
print "<small>". implode(" | ", $links) ."</small><hr />";
foreach (module_list() as $name) {
if (module_hook($name, "help")) {
......
......@@ -22,7 +22,7 @@ function help_admin() {
}
}
print "<small>". implode(" - ", $links) ."</small><hr />";
print "<small>". implode(" | ", $links) ."</small><hr />";
foreach (module_list() as $name) {
if (module_hook($name, "help")) {
......
......@@ -242,7 +242,7 @@ function statistics_admin() {
$links[] = la(t("who's online block"), array("mod" => "statistics", "op" => "whos online block"));
}
$links[] = la(t("help"), array("mod" => "statistics", "op" => "help"));
print "<small>". implode(" &middot; ", $links) ."</small><hr />";
print "<small>". implode(" | ", $links) ."</small><hr />";
/* non-configuration admin pages */
switch ($op) {
......
......@@ -242,7 +242,7 @@ function statistics_admin() {
$links[] = la(t("who's online block"), array("mod" => "statistics", "op" => "whos online block"));
}
$links[] = la(t("help"), array("mod" => "statistics", "op" => "help"));
print "<small>". implode(" &middot; ", $links) ."</small><hr />";
print "<small>". implode(" | ", $links) ."</small><hr />";
/* non-configuration admin pages */
switch ($op) {
......
This diff is collapsed.
This diff is collapsed.
......@@ -1514,7 +1514,7 @@ function user_admin() {
$links[] = la(t("settings"), array("mod" => "user", "op" => "settings"));
$links[] = la(t("help"), array("mod" => "user", "op" => "help"));
print "<small>". implode(" &middot; ", $links) ."</small><hr />";
print "<small>". implode(" | ", $links) ."</small><hr />";
switch ($op) {
case "help":
......
......@@ -1514,7 +1514,7 @@ function user_admin() {
$links[] = la(t("settings"), array("mod" => "user", "op" => "settings"));
$links[] = la(t("help"), array("mod" => "user", "op" => "help"));
print "<small>". implode(" &middot; ", $links) ."</small><hr />";
print "<small>". implode(" | ", $links) ."</small><hr />";
switch ($op) {
case "help":
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment