manuelcillero/suitedesk
manuelcillero/suitedesk
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removing obsolete references to readme files in source code

Browse source
This commit is contained in:
Manuel Cillero 2017-10-03 23:20:11 +02:00
parent 3bcd36d5ab
commit 37c335e3cc
31 changed files with 52 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/admin_menu/admin_menu.module
View file

@ -17,7 +17,7 @@ function admin_menu_help($path, $arg) {
case 'admin/help#admin_menu':
$output = '';
$output .= '<p>' . t('The administration menu module provides a dropdown menu arranged for one- or two-click access to most administrative tasks and other common destinations (to users with the proper permissions). Administration menu also displays the number of anonymous and authenticated users, and allows modules to add their own custom menu items. Integration with the menu varies from module to module; the contributed module <a href="@drupal">Devel</a>, for instance, makes strong use of the administration menu module to provide quick access to development tools.', array('@drupal' => 'http://drupal.org/project/devel')) . '</p>';
$output .= '<p>' . t('The administration menu <a href="@settings">settings page</a> allows you to modify some elements of the menu\'s behavior and appearance. Since the appearance of the menu is dependent on your site theme, substantial customizations require modifications to your site\'s theme and CSS files. See the advanced module README.txt file for more information on theme and CSS customizations.', array('@settings' => url('admin/settings/admin_menu'))) . '</p>';
$output .= '<p>' . t('The administration menu <a href="@settings">settings page</a> allows you to modify some elements of the menu\'s behavior and appearance. Since the appearance of the menu is dependent on your site theme, substantial customizations require modifications to your site\'s theme and CSS files.', array('@settings' => url('admin/settings/admin_menu'))) . '</p>';
$output .= '<p>' . t('The menu items displayed in the administration menu depend upon the actual permissions of the viewer. First, the administration menu is only displayed to users in roles with the <em>Access administration menu</em> (admin_menu module) permission. Second, a user must be a member of a role with the <em>Access administration pages</em> (system module) permission to view administrative links. And, third, only currently permitted links are displayed; for example, if a user is not a member of a role with the permissions <em>Administer permissions</em> (user module) and <em>Administer users</em> (user module), the <em>User management</em> menu item is not displayed.') . '</p>';
return $output;
}
@ -327,4 +327,3 @@ function admin_menu_translated_menu_link_alter(&$item, $map) {
function theme_admin_menu_icon() {
return '<img class="admin-menu-icon" src="'. (theme_get_setting('toggle_favicon') ? theme_get_setting('favicon') : base_path() .'misc/favicon.ico') .'" width="16" height="16" alt="'. t('Home') .'" />';
}

5
modules/advagg/advagg.admin.inc
View file

@ -216,7 +216,6 @@ function advagg_admin_info_form() {
*/
function advagg_admin_settings_form() {
$form = array();
$readme = drupal_get_path('module', 'advagg') . '/README.txt';
$bundle_count = db_result(db_query("SELECT COUNT(*) FROM (SELECT bundle_md5 FROM {advagg_bundles} GROUP BY bundle_md5) as temp"));
$form['advagg_enabled'] = array(
@ -264,13 +263,13 @@ function advagg_admin_settings_form() {
'#type' => 'checkbox',
'#title' => t('Gzip CSS/JS files'),
'#default_value' => variable_get('advagg_gzip_compression', ADVAGG_GZIP_COMPRESSION),
'#description' => t('This might break CSS/JS handling at the Apache level. If it does, use the rules for your webroot level htaccess file before re-enabling. Directions on what to change are located in the <a href="@readme">readme</a> file. In short, be sure to test this out.', array('@readme' => url($readme))),
'#description' => t('This might break CSS/JS handling at the Apache level. If it does, use the rules for your webroot level htaccess file before re-enabling. In short, be sure to test this out.'),
);
$form['advagg_dir_htaccess'] = array(
'#type' => 'checkbox',
'#title' => t('Generate .htaccess files in the advagg_* dirs'),
'#default_value' => variable_get('advagg_dir_htaccess', ADVAGG_DIR_HTACCESS),
'#description' => t('Disable if your using the rules from the <a href="@readme">readme</a> file in your webroot level htaccess file.', array('@readme' => url($readme))),
'#description' => t('Disable if you are using the documented rules in your webroot level htaccess file.'),
);
$form['advagg_rebuild_on_flush'] = array(
'#type' => 'checkbox',

4
modules/advagg/advagg.install
View file

@ -415,8 +415,6 @@ function advagg_check_missing_handler() {
}
}
$readme = drupal_get_path('module', 'advagg') . '/README.txt';
if (module_exists('cdn')) {
$cdn_extra = $t('(both fieldsets)');
}
@ -545,7 +543,7 @@ function advagg_check_missing_handler() {
'title' => $t('Adv CSS/JS Agg - Asynchronous Mode'),
'severity' => REQUIREMENT_ERROR,
'value' => $t('Set to FALSE.'),
'description' => $t('Check to see if you have fast 404s, if so create an exception for this module. The <a href="@readme">readme file</a> explains what needs to be changed. You can try flushing the menu cache as well. ', array('@readme' => url($readme))) . $extra_404,
'description' => $t('Check to see if you have fast 404s, if so create an exception for this module. You can try flushing the menu cache as well. ') . $extra_404,
);
}
}

15
modules/better_formats/better_formats.module
View file

@ -7,21 +7,6 @@
* controls format display options, works with CCK fields.
*/
/**
* Implementation of hook_help().
*/
function better_formats_help($path, $arg) {
switch ($path) {
case 'admin/help/better_formats':
$output = '<p>' . t('See the module README.txt file in the better_formats module directory for help.') . '</p>';
break;
default:
$output = '';
}
return $output;
}
/**
* Implementation of hook_perm().
*/

2
modules/calendar/calendar_ical/theme.inc
View file

@ -71,7 +71,7 @@ function template_preprocess_calendar_view_ical(&$vars) {
}
$headertitle = filter_xss_admin($view->get_title());
$title = variable_get('site_name', 'Drupal');
$title = variable_get('site_name', 'SuiteDesk');
$description = $headertitle . ($title ? ' | '. $title : '');
$vars['calname'] = $description;

4
modules/ckeditor/ckeditor.install
View file

@ -424,7 +424,7 @@ function _ckeditor_requirements_ckfinder_config_check($profile_name) {
}
if (!$require_once_found) {
return t('You are using a feature that requires manual integration in the <code>config.php</code> file. Please read the "Installing CKFinder" section in the <code>!readme</code> file carefully and add a <code>require_once ...</code> statement to the <code>%ckfconfig</code> file.', array('%ckfconfig' => $config_path, '!readme' => l(t('README.txt'), $base_url . '/' . drupal_get_path('module', 'ckeditor') . '/README.txt', array('absolute' => TRUE))));
return t('You are using a feature that requires manual integration in the <code>config.php</code> file. Be carefull and add a <code>require_once ...</code> statement to the <code>%ckfconfig</code> file.', array('%ckfconfig' => $config_path));
}
if ($userfiles_absolute_path_line && $force_single_extension_line && (
@ -634,4 +634,4 @@ function ckeditor_update_6102() {
*/
function ckeditor_uninstall() {
drupal_uninstall_schema('ckeditor');
}
}

3
modules/ckeditor/includes/ckeditor.admin.inc
View file

@ -49,10 +49,9 @@ function ckeditor_admin_main() {
)
));
drupal_set_message(t(
'The CKEditor component is not installed correctly. Please go to the !ckeditorlink in order to download the latest version. After that you must extract the files to the !ckeditorpath or !librarypath directory and make sure that the !ckeditorfile or !ckeditorlibrary file exists. Refer to the !readme file for more information.',
'The CKEditor component is not installed correctly. Please go to the !ckeditorlink in order to download the latest version. After that you must extract the files to the !ckeditorpath or !librarypath directory and make sure that the !ckeditorfile or !ckeditorlibrary file exists.',
array(
'!ckeditorlink' => l(t('CKEditor homepage'), 'http://ckeditor.com/download'),
'!readme' => l(t('README.txt'), drupal_get_path('module', 'ckeditor') . '/README.txt', array('absolute' => TRUE)),
'!ckeditorpath' => '<code>' . $editor_path . '</code>',
'!ckeditorsubdir' => '<code>' . $editor_path . '/editor</code>',
'!ckeditorfile' => '<code>' . $editor_path . '/ckeditor.js</code>',

7
modules/ckeditor/includes/ckeditor.page.inc
View file

@ -125,12 +125,7 @@ function ckeditor_help_delegate($path, $arg) {
)
) .
'<br /><code>'. htmlspecialchars('<a> <p> <span> <div> <h1> <h2> <h3> <h4> <h5> <h6> <img> <map> <area> <hr> <br> <br /> <ul> <ol> <li> <dl> <dt> <dd> <table> <tbody> <th> <tr> <td> <em> <b> <u> <i> <strong> <del> <ins> <sub> <sup> <quote> <blockquote> <pre> <address> <code> <cite> <embed> <object> <param> <strike> <caption> <iframe>') .'</code><br />';
$output .= t('<strong>Note:</strong> be careful when granting users access to create tags like %iframe. <br />If you are going to use CKEditor with the <strong>Filtered HTML</strong> input format, please read the "Setting up filters" section in the !readme file.',
array(
'!readme' => '<code>' . l('README.txt', drupal_get_path('module', 'ckeditor') .'/README.txt') . '</code>',
'%iframe' => '<iframe>'
)
) .
$output .= t('<strong>Note:</strong> be careful when granting users access to create tags like %iframe.') .
'</li>' .
'<li>'.
t('To have better control over line breaks, you should disable the <strong>%settingname</strong> setting in the chosen filter (recommended).',

2
modules/ckeditor_link/ckeditor_link.module
View file

@ -263,7 +263,7 @@ function _ckeditor_link_filter_process($matches) {
}
function ckeditor_link_get_link_type_name() {
return t(variable_get('ckeditor_link_type_name', 'Internal path'), array('!site_name' => variable_get('site_name', 'Drupal')));
return t(variable_get('ckeditor_link_type_name', 'Internal path'), array('!site_name' => variable_get('site_name', 'SuiteDesk')));
}
function ckeditor_link_path_strip_language($path, &$langcode) {

2
modules/filter/filter.module
View file

@ -187,7 +187,7 @@ function filter_filter_tips($delta, $format, $long = FALSE) {
<p>This site allows HTML content. While learning all of HTML may feel intimidating, learning how to use a very small number of the most basic HTML "tags" is very easy. This table provides examples for each tag that is enabled on this site.</p>
<p>For more information see W3C\'s <a href="http://www.w3.org/TR/html/">HTML Specifications</a> or use your favorite search engine to find other sites that explain HTML.</p>');
$tips = array(
'a' => array( t('Anchors are used to make links to other pages.'), '<a href="'. $base_url .'">'. variable_get('site_name', 'Drupal') .'</a>'),
'a' => array( t('Anchors are used to make links to other pages.'), '<a href="'. $base_url .'">'. variable_get('site_name', 'SuiteDesk') .'</a>'),
'br' => array( t('By default line break tags are automatically added, so use this tag to add additional ones. Use of this tag is different because it is not used with an open/close pair like all the others. Use the extra " /" inside the tag to maintain XHTML 1.0 compatibility'), t('Text with <br />line break')),
'p' => array( t('By default paragraph tags are automatically added, so use this tag to add additional ones.'), '<p>'. t('Paragraph one.') .'</p> <p>'. t('Paragraph two.') .'</p>'),
'strong' => array( t('Strong'), '<strong>'. t('Strong') .'</strong>'),

4
modules/i18n/i18nsync/i18nsync.module
View file

@ -30,7 +30,7 @@ function i18nsync_help($path, $arg) {
$output .= '</ul>';
$output .= '<p><strong>'. t('Note that permissions are not checked for each node. So if someone can edit a node and it is set to synchronize, all the translations will be synchronized anyway.') .'</strong></p>';
$output .= '<p>'. t('To enable synchronization check content type options to select which fields to synchronize for each node type.') .'</p>';
$output .= '<p>'. t('The list of available fields for synchronization will include some standard node fields and all CCK fields. You can add more fields to the list in a configuration variable. See README.txt for how to do it.') .'</p>';
$output .= '<p>'. t('The list of available fields for synchronization will include some standard node fields and all CCK fields. You can add more fields to the list in a configuration variable.') .'</p>';
$output .= '<p>'. t('For more information, see the online handbook entry for <a href="@i18n">Internationalization module</a>.', array('@i18n' => 'http://drupal.org/node/133977')) .'</p>';
return $output;
}
@ -196,7 +196,7 @@ function i18nsync_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
}
}
// Intentional no break.
case 'update':
case 'update':
// Let's go with field synchronization.
if (!empty($node->tnid) && ($fields = i18nsync_node_fields($node->type)) && ($translations = _i18nsync_node_translations($node, TRUE))) {
$i18nsync = TRUE;

2
modules/i18n/i18ntaxonomy/i18ntaxonomy.pages.inc
View file

@ -48,7 +48,7 @@ function i18ntaxonomy_term_page($str_tids = '', $depth = 0, $op = 'page') {
case 'feed':
$channel['link'] = url('taxonomy/term/'. $str_tids .'/'. $depth, array('absolute' => TRUE));
$channel['title'] = variable_get('site_name', 'Drupal') .' - '. $title;
$channel['title'] = variable_get('site_name', 'SuiteDesk') .' - '. $title;
// Only display the description if we have a single term, to avoid clutter and confusion.
if (count($tids) == 1) {

4
modules/node/node.module
View file

@ -1750,7 +1750,7 @@ function node_feed($nids = FALSE, $channel = array()) {
$channel_defaults = array(
'version' => '2.0',
'title' => variable_get('site_name', 'Drupal'),
'title' => variable_get('site_name', 'SuiteDesk'),
'link' => $base_url,
'description' => variable_get('site_mission', ''),
'language' => $language->language
@ -1781,7 +1781,7 @@ function node_page_default() {
if ($num_rows) {
$feed_url = url('rss.xml', array('absolute' => TRUE));
drupal_add_feed($feed_url, variable_get('site_name', 'Drupal') .' '. t('RSS'));
drupal_add_feed($feed_url, variable_get('site_name', 'SuiteDesk') .' '. t('RSS'));
$output .= theme('pager', NULL, variable_get('default_nodes_main', 10));
}
else {

2
modules/password_policy/password_policy.module
View file

@ -757,7 +757,7 @@ function password_policy_mail_tokens($params, $language) {
$tokens = array(
'!username' => $account->name,
'!mailto' => $account->mail,
'!site' => variable_get('site_name', 'Drupal'),
'!site' => variable_get('site_name', 'SuiteDesk'),
'!uri' => $base_url,
'!uri_brief' => drupal_substr($base_url, drupal_strlen('http://')),
'!date' => format_date(time(), 'medium', '', NULL, $language->language),

6
modules/path_alias_xt/path_alias_xt.install
View file

@ -17,9 +17,7 @@ function path_alias_xt_requirements($phase) {
);
if (!$has_runkit) {
$requirements['path_alias_xt']['severity'] = REQUIREMENT_INFO;
$requirements['path_alias_xt']['description'] = $t('Reminder: as the PECL runkit is not installed, please edit file %path-inc if you have not done so already. See the !README file for details.',
array('%path-inc' => 'include/path.inc',
'!README' => '<a href=/'. drupal_get_path('module', 'path_alias_xt') .'/README.txt>README</a>'));
$requirements['path_alias_xt']['description'] = $t('Reminder: as the PECL runkit is not installed, please edit file %path-inc if you have not done so already.');
}
return $requirements;
}
@ -36,4 +34,4 @@ function path_alias_xt_install() {
*
function path_alias_xt_uninstall() {
}
*/
*/

15
modules/path_alias_xt/path_alias_xt.module
View file

@ -32,19 +32,6 @@ function path_alias_xt_boot() {
return;
}
/**
* Implementation of hook_help().
*/
function path_alias_xt_help($path, $arg) {
switch ($path) {
case 'admin/help#path_alias_xt':
$s = t('Installation instructions are in the README.txt file. Further documentation is on the <a href="@path_alias_xt">Extended Path Aliases</a> project page.',
array('@path_alias_xt' => url('http://drupal.org/project/path_alias_xt')));
break;
}
return empty($s) ? '' : '<p>'. $s .'</p>';
}
/**
* Implementation of hook_menu().
*
@ -107,7 +94,7 @@ function path_alias_xt_get_path_alias($path, $path_language = '') {
if ($user_alias = drupal_lookup_path('alias', 'user', $path_language)) {
return "$user_alias/$matches[3]";
}
}
}
if ($alias = drupal_lookup_path('alias', "$matches[1]/$matches[2]", $path_language)) {
return "$alias/$matches[3]";
}

2
modules/print/print.pages.inc
View file

@ -233,7 +233,7 @@ function _print_var_generator($node, $message = NULL, $cid = NULL) {
break;
}
$logo_url = preg_replace('!^'. base_path() .'!', '', $logo_url);
$site_name = variable_get('site_name', 'Drupal');
$site_name = variable_get('site_name', 'SuiteDesk');
$print['logo'] = $logo_url ? theme('image', $logo_url, $site_name, '', array('class' => 'print-logo', 'id' => 'logo'), FALSE) : '';
switch ($print_footer_options) {

2
modules/print/print_pdf/print_pdf.pages.inc
View file

@ -329,7 +329,7 @@ function _print_pdf_tcpdf($print, $html, $filename = NULL) {
if (isset($print['submitted'])) {
$pdf->SetAuthor(strip_tags($print['submitted']));
}
$pdf->SetCreator(variable_get('site_name', 'Drupal'));
$pdf->SetCreator(variable_get('site_name', 'SuiteDesk'));
$pdf->SetTitle(html_entity_decode($print['title'], ENT_QUOTES, 'UTF-8'));
if (isset($print['taxonomy'])) {
$keys = implode(' ', explode("\n", trim(strip_tags($print['taxonomy']))));

20
modules/storm/storm.module
View file

@ -3358,9 +3358,9 @@ function _storm_notify_send($send_start = NULL) {
}
function storm_mail($key, &$message, $params) {
global $user, $base_url;
global $user, $base_url, $conf;
$sitename = '<strong>' . variable_get('site_name', 'Drupal') . '</strong>';
$sitename = '<strong>' . variable_get('site_name', 'SuiteDesk') . '</strong>';
$url_preferences = str_replace('http://', 'https://', url("user/$user->uid/notify", array('absolute' => TRUE)));
$headers = array(
@ -3373,7 +3373,7 @@ function storm_mail($key, &$message, $params) {
$message['headers'][$key] = $value;
}
$message['subject'] = t('!sitename notification for !username', array('!sitename' => variable_get('site_name', 'Drupal'), '!username' => $user->name));
$message['subject'] = t('!sitename notification for !username', array('!sitename' => variable_get('site_name', 'SuiteDesk'), '!username' => $user->name));
$message['body'] = '<div style="width: 96%; max-width: 800px; margin: 0 auto;">' .
'<p style="color: #777; font-size: 1.8em; margin: .5em 0;">' . t('Hi !username!', array('!username' => '<strong>' . $user->name . '</strong>')) . '&nbsp;</p>' .
@ -3385,13 +3385,13 @@ function storm_mail($key, &$message, $params) {
'</p><p>' .
t('!suitedesk is a web based software for project management, planning, personal productivity, communication between project stakeholders, collaboration, customers support, documentation, cost control and change management.', array('!suitedesk' => '<a href="' . $base_url . '" style="color: blue;">SuiteDesk</a>', '!sitename' => $sitename)) .
'</p>' .
'<p>Manuel Cillero 【ツ】</p>' .
'<p style="font-size: smaller;"><a href="mailto:manuel@cillero.es" style="color: blue;">manuel@cillero.es</a><br />' .
'<a href="https://manuel.cillero.es" style="color: blue;">https://manuel.cillero.es</a><br />' .
'<a href="https://twitter.com/manuelcillero" style="color: blue;">https://twitter.com/manuelcillero</a><br />' .
'<a href="https://facebook.com/manuelcillero" style="color: blue;">https://facebook.com/manuelcillero</a></p>' .
'</div>' .
'<img style="margin: 1em 0; max-width: 100%; height: auto;" src="http://manuel.cillero.es/logo.png" alt="manuel.cillero.es" />' .
'<p>' . variable_get('site_name', 'SuiteDesk') . '</p>' .
'<p style="font-size: smaller;">' .
(!empty($conf['social_website']) ? '<a href="' . $conf['social_website'] . '" style="color: blue;">' . $conf['social_website'] . '</a><br />' : '') .
(!empty($conf['social_linkedin']) ? '<a href="' . $conf['social_linkedin'] . '" style="color: blue;">' . $conf['social_linkedin'] . '</a><br />' : '') .
(!empty($conf['social_twitter']) ? '<a href="' . $conf['social_twitter'] . '" style="color: blue;">' . $conf['social_twitter'] . '</a><br />' : '') .
(!empty($conf['social_facebook']) ? '<a href="' . $conf['social_facebook'] . '" style="color: blue;">' . $conf['social_facebook'] . '</a><br />' : '') .
'</p></div>' .
'</div>';
}

2
modules/storm/storm.theme.inc
View file

@ -42,7 +42,7 @@ function theme_storm_list_report($header, $rows, $title, $footer) {
$o = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
$o .= '<html xmlns="http://www.w3.org/1999/xhtml">';
$o .= '<head>';
$o .= '<title>'. (drupal_get_title() ? strip_tags(drupal_get_title()) : variable_get('site_name', 'Drupal')) .'</title>';
$o .= '<title>'. (drupal_get_title() ? strip_tags(drupal_get_title()) : variable_get('site_name', 'SuiteDesk')) .'</title>';
$o .= '<link type="text/css" rel="stylesheet" media="all" href="'. base_path() . $css_all_file . $query_string .'" />';
$o .= '</head>';
$o .= '<body>';

2
modules/storm/storminvoice/storminvoice.theme.inc
View file

@ -475,7 +475,7 @@ function theme_storminvoice_report_pdf($node, $language, $output = 'screen') {
// Performs simple check for existance of tcpdf library . If it doesn't exist, revert to node display with message about tcpdf library.
if (!file_exists($tcpdf_dir .'/tcpdf.php')) {
drupal_set_message(t('The tcpdf library has not been installed. See the SuiteDesk module README.txt for more details.'));
drupal_set_message(t('The tcpdf library has not been installed.'));
drupal_goto('node/'. $node->nid);
}

2
modules/system/system.admin.inc
View file

@ -1726,7 +1726,7 @@ function system_site_maintenance_settings() {
$form['site_offline_message'] = array(
'#type' => 'textarea',
'#title' => t('Site off-line message'),
'#default_value' => variable_get('site_offline_message', t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal')))),
'#default_value' => variable_get('site_offline_message', t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'SuiteDesk')))),
'#description' => t('Message to show visitors when the site is in off-line mode.')
);

4
modules/system/system.module
View file

@ -1799,7 +1799,7 @@ function system_mail($key, &$message, $params) {
$account = $params['account'];
$context = $params['context'];
$variables = array(
'%site_name' => variable_get('site_name', 'Drupal'),
'%site_name' => variable_get('site_name', 'SuiteDesk'),
'%username' => $account->name,
);
if ($context['hook'] == 'taxonomy') {
@ -1855,7 +1855,7 @@ function system_message_action_submit($form, $form_state) {
function system_message_action(&$object, $context = array()) {
global $user;
$variables = array(
'%site_name' => variable_get('site_name', 'Drupal'),
'%site_name' => variable_get('site_name', 'SuiteDesk'),
'%username' => $user->name ? $user->name : variable_get('anonymous', t('Anonymous')),
);

4
modules/taxonomy/taxonomy.pages.inc
View file

@ -48,7 +48,7 @@ function taxonomy_term_page($str_tids = '', $depth = 0, $op = 'page') {
case 'feed':
$channel['link'] = url('taxonomy/term/'. $str_tids .'/'. $depth, array('absolute' => TRUE));
$channel['title'] = variable_get('site_name', 'Drupal') .' - '. $title;
$channel['title'] = variable_get('site_name', 'SuiteDesk') .' - '. $title;
// Only display the description if we have a single term, to avoid clutter and confusion.
if (count($tids) == 1) {
$term = taxonomy_get_term($tids[0]);
@ -57,7 +57,7 @@ function taxonomy_term_page($str_tids = '', $depth = 0, $op = 'page') {
}
$result = taxonomy_select_nodes($tids, $terms['operator'], $depth, FALSE);
$items = array();
$items = array();
while ($row = db_fetch_object($result)) {
$items[] = $row->nid;
}

2
modules/views/theme/theme.inc
View file

@ -559,7 +559,7 @@ function template_preprocess_views_view_rss(&$vars) {
$vars['description'] = check_plain(decode_entities(strip_tags($description)));
if ($view->display_handler->get_option('sitename_title')) {
$title = variable_get('site_name', 'Drupal');
$title = variable_get('site_name', 'SuiteDesk');
if ($slogan = variable_get('site_slogan', '')) {
$title .= ' - ' . $slogan;
}