summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Reyero2007-12-04 20:17:44 (GMT)
committer Jose Reyero2007-12-04 20:17:44 (GMT)
commita6ad6443f9b04b26314bbfd899f9a55011ef7664 (patch)
tree95777a29504edeb499abe044ce7d1af3df027b69
parent7b53c9af8a3fb80d04e940483c263ae0b4219eff (diff)
Fixed multiple issues:
- Warning: Call-time pass-by-reference has been deprecated in ttext.module, http://drupal.org/node/163890 - Warning: Call-time pass-by-reference has been deprecated in i18nsync.module, http://drupal.org/node/196276 - Warning when icon size set to blank, http://drupal.org/node/197403 - Help page wrong link, http://drupal.org/node/195755 - Installation problem pgsql i18nblocks.module, http://drupal.org/node/195672 - Front page not translated, http://drupal.org/node/193645
-rw-r--r--experimental/i18nsync.module2
-rw-r--r--i18n.module13
-rw-r--r--i18nblocks/i18nblocks.install2
3 files changed, 10 insertions, 7 deletions
diff --git a/experimental/i18nsync.module b/experimental/i18nsync.module
index 4375d91..881af95 100644
--- a/experimental/i18nsync.module
+++ b/experimental/i18nsync.module
@@ -139,7 +139,7 @@ function i18nsync_node_translation($node, $translation, $fields) {
switch($field) {
case 'parent': // Book outlines, translating parent page if exists
case 'iid': // Attached image nodes
- i18nsync_node_translation_attached_node(&$node, &$translation, $field);
+ i18nsync_node_translation_attached_node($node, $translation, $field);
break;
case 'files':
// Sync existing attached files
diff --git a/i18n.module b/i18n.module
index 64eb6fb..407f755 100644
--- a/i18n.module
+++ b/i18n.module
@@ -70,6 +70,11 @@ function i18n_block($op = 'list', $delta = 0) {
*/
function i18n_init(){
global $i18n_langpath;
+ // If not in bootstrap, variable init. This may go before the rest of the code because some variables may need to be loaded
+ if(!_i18n_is_bootstrap()){
+ //include drupal_get_path('module', 'i18n').'/i18n.inc';
+ i18n_variable_init();
+ }
$lang = i18n_get_lang();
$path = _i18n_get_original_path();
// Init selection mode
@@ -94,11 +99,7 @@ function i18n_init(){
//search alias with and without lang and remove lang.
$_GET['q'] = i18n_get_normal_path($path);
}
- // If not in bootstrap, variable init
- if(!_i18n_is_bootstrap()){
- //include drupal_get_path('module', 'i18n').'/i18n.inc';
- i18n_variable_init();
- }
+
}
/**
@@ -117,7 +118,7 @@ function i18n_help($section = 'admin/help#i18n' ) {
$output .= '<li>'.t('Support for long locale names').'</li>';
$output .= '<li>'.t('Multilingual menu items').'</li>';
$output .= '</ul>';
- $output .= '<p>'. t('For more information please read the <a href="@i18n">on-line help pages</a>.', array('@i18n' =>'http://drupal.org/node/31631')) .'</p>';
+ $output .= '<p>'. t('For more information please read the <a href="@i18n">on-line help pages</a>.', array('@i18n' =>'http://drupal.org/node/133977')) .'</p>';
return $output;
case 'admin/settings/i18n':
$output .= '<p>'.t('To enable multilingual support for specific content types go to !configure_content_types.', array('!configure_content_types' => l(t('configure content types'), 'admin/content/types'), )).'</p>';
diff --git a/i18nblocks/i18nblocks.install b/i18nblocks/i18nblocks.install
index 9a5645c..49e556d 100644
--- a/i18nblocks/i18nblocks.install
+++ b/i18nblocks/i18nblocks.install
@@ -37,6 +37,8 @@ function i18nblocks_install() {
module varchar(64) NOT NULL DEFAULT '',
delta varchar(32) NOT NULL DEFAULT '0',
PRIMARY KEY (bid,language))");
+ // Sequences
+ db_query("CREATE SEQUENCE {i18n_blocks}_delta_seq INCREMENT 1 START 1");
break;
}
db_query("UPDATE {system} SET weight = 20 WHERE name = 'i18nblocks' AND type = 'module'");