Commit 4123d612 authored by lphuberdeau's avatar lphuberdeau

[MRG] Automatic merge, branches/7.x 34885 to 34926

parent dab3ea16
......@@ -1459,6 +1459,7 @@ installer/schema/20110609_missing_sql_tiki.sql -text
installer/schema/20110609_unique_login_tiki.php -text
installer/schema/20110610_readd_sefurl_index_left_tiki.sql -text
installer/schema/20110610_revert_poll_additions_tiki.php -text
installer/schema/20110611_accounting_fix_primarykeys_tiki.sql -text
installer/schema/20110613_filegal_source_display_tiki.sql -text
installer/schema/20110614_provider_authentication_tiki.sql -text
installer/schema/99999999_image_plugins_kill_tiki.php -text
......
# $Id$ [This line is used to check that this htaccess file is up to date. Do not edit this line and leave it as the first line.]
# $Id: _htaccess 33755 2011-04-01 17:01:37Z sylvieg $ [This line is used to check that this htaccess file is up to date. Do not edit this line and leave it as the first line.]
# These are suggested Rewrite Rules for use with Tiki.
# They enhance security and permit short URLs.
# In your Tiki instance, visit tiki-admin.php?page=sefurl
......
......@@ -3595,7 +3595,7 @@ CREATE TABLE `tiki_acct_journal` (
`journalDescription` varchar(255) NOT NULL,
`journalCancelled` int(1) NOT NULL DEFAULT '0',
`journalTs` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`journalBookId`,`journalId`)
PRIMARY KEY (`journalId`)
) ENGINE=MyISAM;
DROP TABLE IF EXISTS `tiki_acct_stack`;
......@@ -3605,7 +3605,7 @@ CREATE TABLE `tiki_acct_stack` (
`stackDate` date NOT NULL DEFAULT '0000-00-00',
`stackDescription` varchar(255) NOT NULL,
`stackTs` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`stackBookId`,`stackId`)
PRIMARY KEY (`stackId`)
) ENGINE=MyISAM;
DROP TABLE IF EXISTS `tiki_acct_stackitem`;
......@@ -3634,7 +3634,7 @@ CREATE TABLE `tiki_acct_statement` (
`statementAmount` double NOT NULL,
`statementJournalId` int(10) unsigned NOT NULL DEFAULT '0',
`statementStackId` int(11) NOT NULL,
PRIMARY KEY (`statementBookId`,`statementAccountId`,`statementId`)
PRIMARY KEY (`statementId`)
) ENGINE=MyISAM;
DROP TABLE IF EXISTS `tiki_acct_tax`;
......@@ -3644,7 +3644,7 @@ CREATE TABLE `tiki_acct_tax` (
`taxText` varchar(63) NOT NULL,
`taxAmount` double NOT NULL DEFAULT '0',
`taxIsFix` enum('y','n') NOT NULL DEFAULT 'n',
PRIMARY KEY (`taxBookId`,`taxId`)
PRIMARY KEY (`taxId`)
) ENGINE=MyISAM;
DROP TABLE IF EXISTS `tiki_queue`;
......
INSERT INTO `tiki_history`(`pageName`, `version`, `version_minor`, `lastModif`, `user`, `ip`, `comment`, `data`, `description`,`is_html`)
INSERT IGNORE INTO `tiki_history`(`pageName`, `version`, `version_minor`, `lastModif`, `user`, `ip`, `comment`, `data`, `description`,`is_html`)
SELECT `pageName`, `version`, `version_minor`, `lastModif`, `user`, `ip`, `comment`, `data`, `description`,`is_html`
FROM tiki_pages;
ALTER TABLE `tiki_acct_journal` DROP PRIMARY KEY , ADD PRIMARY KEY ( `journalId` );
ALTER TABLE `tiki_acct_stack` DROP PRIMARY KEY , ADD PRIMARY KEY ( `stackId` );
ALTER TABLE `tiki_acct_statement` DROP PRIMARY KEY , ADD PRIMARY KEY ( `statementId` );
ALTER TABLE `tiki_acct_tax` DROP PRIMARY KEY , ADD PRIMARY KEY ( `taxId` );
\ No newline at end of file
......@@ -46,7 +46,7 @@ abstract class Tracker_Field_Abstract implements Tracker_Field_Interface
}
if (!empty($context['url']) && strpos($context['url'], 'itemId') !== false) {
$context['url'] = preg_replace('/&itemId=[^&]*/', '&itemId=' . $itemId, $context['url']);
$context['url'] = preg_replace('/([&|\?])itemId=?[^&]*/', '\\1itemId=' . $itemId, $context['url']);
$arguments['href'] = $context['url'];
}
......
......@@ -277,12 +277,15 @@ class PreferencesLib
private function getFileData( $file, $partial = false ) {
if( ! isset( $this->files[$file] ) ) {
require_once 'lib/prefs/' . $file . '.php';
$function = "prefs_{$file}_list";
if( function_exists( $function ) ) {
$this->files[$file] = $function($partial);
} else {
$this->files[$file] = array();
$inc_file = "lib/prefs/{$file}.php";
if (file_exists( $inc_file )) {
require_once $inc_file;
$function = "prefs_{$file}_list";
if( function_exists( $function ) ) {
$this->files[$file] = $function($partial);
} else {
$this->files[$file] = array();
}
}
}
......
......@@ -13,6 +13,7 @@ function wikiplugin_code_info() {
'prefs' => array('wikiplugin_code'),
'body' => tra('Code'),
'icon' => 'pics/icons/page_white_code.png',
'filter' => 'rawhtml_unsafe',
'params' => array(
'caption' => array(
'required' => false,
......
......@@ -26,7 +26,6 @@
{preference name=newsletter_external_client}
{preference name=tiki_check_file_content}
<fieldset>
<legend>{tr}CSRF Security{/tr}{help url="Security"}</legend>
<div class="adminoptionbox">
......
{* $Id$ *}
<input type="hidden" name="no_bl" value="y" />
<input type="submit" class="wikiaction" title="{tr}Preview your changes.{/tr}" name="preview" id="preview" value="{tr}Preview{/tr}" onclick="needToConfirm=false;" />
<input type="submit" class="wikiaction" title="{tr}Preview your changes.{/tr}" name="preview" value="{tr}Preview{/tr}" onclick="needToConfirm=false;" />
{if $prefs.ajax_autosave eq "y"}
{jq} $("#preview").click(function(){
{jq} $("input[name=preview]").click(function(){
auto_save_data['editwiki'] = "";
auto_save('editwiki', autoSaveId);
if (!ajaxPreviewWindow) {
......
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