Commit 0891c624 authored by jonnybradley's avatar jonnybradley

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

Conflicts:  lang/de/language.php and lang/pt-br/language.php resolved using "mine full"
            lib/setup/twversion.class.php and lib/setup/perms.php fixed manually
parent 5e3e5ccc
......@@ -1419,7 +1419,6 @@ installer/schema/20101130_tiki_accounting_tiki.sql -text
installer/schema/20101201_tiki_accounting_fix_index_tiki.sql -text
installer/schema/20101203_fgal_archive_default_tiki.sql -text
installer/schema/20101207_feature_file_drafts_tiki.sql -text
installer/schema/20101207_unique_login_tiki.php -text
installer/schema/20101208_webservice_soap_tiki.sql -text
installer/schema/20101210_fgal_add_wiki_attachments_tiki.php -text
installer/schema/20101210_sync_users_ldap_tiki.sql -text
......@@ -1455,6 +1454,10 @@ installer/schema/20110513_banner_tiki.sql -text
installer/schema/20110519_quick_edit_categ_params_merge_tiki.php -text
installer/schema/20110603_convert_tracker_comments_tiki.sql -text
installer/schema/20110606_convert_ip_fields_to_ipv6_tiki.sql -text
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/99999999_image_plugins_kill_tiki.php -text
installer/schema/index.php -text
installer/shell.php -text
......
Tiki! The wiki with a lot of features!
Version 7.0RC1
Version 7.0
DOCUMENTATION
......
This diff is collapsed.
......@@ -12,8 +12,8 @@ This is how we implement the Tiki Social Contract.
http://tiki.org/Social+Contract
List of members of the Community
As of 2011-05-27, the community has:
* 506 members on SourceForge.net,
As of 2011-06-09, the community has:
* 508 members on SourceForge.net,
* 250 of those people who made at least one code commit
This list is automatically generated and alphabetically sorted
......@@ -390,15 +390,15 @@ SF Role: Developer
Nickname: changi67
Name: Jean-François B.
First Commit: 2009-04-23
Last Commit: 2011-05-19
Number of Commits: 556
Last Commit: 2011-06-09
Number of Commits: 567
SF Role: Packager (.rpm, .deb etc)
Nickname: chealer
Name: Philippe Cloutier
First Commit: 2003-09-27
Last Commit: 2011-05-27
Number of Commits: 1115
Last Commit: 2011-06-09
Number of Commits: 1139
SF Role: Developer
Nickname: chessy
......@@ -408,8 +408,8 @@ SF Role: Developer
Nickname: chibaguy
Name: Gary Cunningham-Lee
First Commit: 2006-02-04
Last Commit: 2011-05-26
Number of Commits: 1602
Last Commit: 2011-06-09
Number of Commits: 1620
SF Role: Web Designer
Nickname: chris_holman
......@@ -472,8 +472,8 @@ SF Role: Developer
Nickname: dabright
Name: D.A. Bright
First Commit: 2003-11-12
Last Commit: 2011-02-26
Number of Commits: 6
Last Commit: 2011-05-31
Number of Commits: 9
SF Role: Developer
Nickname: daevermann
......@@ -826,7 +826,7 @@ Nickname: ggeller
Name: George Geller
First Commit: 2003-12-07
Last Commit: 2005-11-30
Number of Commits: 159
Number of Commits: 161
SF Role: Developer
Nickname: giak
......@@ -880,6 +880,9 @@ Last Commit: 2004-01-07
Number of Commits: 5
SF Role: Developer
Nickname: gregejack
Name: Greg J
Nickname: gregmartin
Name: Greg Martin
First Commit: 2006-12-19
......@@ -897,8 +900,8 @@ SF Role: Developer
Nickname: gta74
First Commit: 2011-01-29
Last Commit: 2011-03-20
Number of Commits: 15
Last Commit: 2011-06-05
Number of Commits: 16
Nickname: guideweb
Name: Samuel Denis D'Ortun
......@@ -1165,8 +1168,8 @@ SF Role: Developer
Nickname: jonnybradley
Name: jonny Bradley
First Commit: 2007-08-15
Last Commit: 2011-05-27
Number of Commits: 3504
Last Commit: 2011-06-09
Number of Commits: 3532
SF Role: Developer
Nickname: jorgercosta
......@@ -1228,8 +1231,8 @@ Name: Jyes Beat
Nickname: jyhem
Name: Jean-Marc Libs
First Commit: 2006-12-11
Last Commit: 2010-12-13
Number of Commits: 500
Last Commit: 2011-05-30
Number of Commits: 503
SF Role: Developer
Nickname: k2s
......@@ -1309,7 +1312,7 @@ Name: lady
Nickname: laetzer
First Commit: 2004-01-09
Last Commit: 2004-01-10
Number of Commits: 4
Number of Commits: 6
SF Role: Developer
Nickname: lauraxthomson
......@@ -1357,8 +1360,8 @@ SF Role: Developer
Nickname: lindonb
First Commit: 2009-05-10
Last Commit: 2011-05-15
Number of Commits: 424
Last Commit: 2011-06-05
Number of Commits: 427
Nickname: llunax
Name: Lluna
......@@ -1387,8 +1390,8 @@ Name: Louis-Martin Richard
Nickname: lphuberdeau
Name: Louis-Philippe Huberdeau
First Commit: 2004-04-10
Last Commit: 2011-05-27
Number of Commits: 2167
Last Commit: 2011-06-09
Number of Commits: 2224
SF Role: Developer
Nickname: lrargerich
......@@ -1468,8 +1471,8 @@ SF Role: Developer
Nickname: marclaporte
Name: Marc Laporte
First Commit: 2003-11-28
Last Commit: 2011-05-27
Number of Commits: 1157
Last Commit: 2011-06-09
Number of Commits: 1161
SF Role: Project Manager
Nickname: marcmont
......@@ -1654,6 +1657,9 @@ Last Commit: 2008-08-19
Number of Commits: 2
SF Role: Doc Writer
Nickname: mlustenberg
Name: Mauriz
Nickname: monthorin
Name: Loïc Monthorin
SF Role: Developer
......@@ -1672,7 +1678,7 @@ SF Role: Developer
Nickname: mose
First Commit: 2003-06-12
Last Commit: 2008-03-22
Number of Commits: 1950
Number of Commits: 1954
SF Role: Project Manager
Nickname: mrbuiu
......@@ -1756,8 +1762,8 @@ Number of Commits: 3
Nickname: nkoth
Name: Nelson
First Commit: 2007-05-17
Last Commit: 2011-05-14
Number of Commits: 892
Last Commit: 2011-06-07
Number of Commits: 896
SF Role: Developer
Nickname: normandaoust
......@@ -2111,8 +2117,8 @@ SF Role: Developer
Nickname: robertplummer
Name: Robert Plummer
First Commit: 2010-06-30
Last Commit: 2011-05-04
Number of Commits: 202
Last Commit: 2011-06-09
Number of Commits: 213
Nickname: robferguson
Name: Rob Ferguson
......@@ -2163,7 +2169,7 @@ SF Role: Developer
Nickname: russwilde
First Commit: 2004-05-13
Last Commit: 2004-05-13
Number of Commits: 1
Number of Commits: 2
Nickname: rv540
Name: Hervé Schoenenberger
......@@ -2215,8 +2221,8 @@ SF Role: Developer
Nickname: sept_7
Name: Stéphane Casset
First Commit: 2007-07-03
Last Commit: 2011-05-12
Number of Commits: 1038
Last Commit: 2011-06-07
Number of Commits: 1046
Nickname: sewilco
Name: Scot Wilcoxon
......@@ -2328,8 +2334,8 @@ SF Role: Developer
Nickname: sylvieg
Name: Sylvie Greverend
First Commit: 2003-05-28
Last Commit: 2011-05-27
Number of Commits: 6600
Last Commit: 2011-06-09
Number of Commits: 6638
SF Role: Developer
Nickname: syracine
......@@ -2356,7 +2362,7 @@ Nickname: telenieko
Name: TeLeNiEkO
First Commit: 2004-04-24
Last Commit: 2005-01-18
Number of Commits: 22
Number of Commits: 23
SF Role: Developer
Nickname: terris
......@@ -2535,8 +2541,8 @@ SF Role: Developer
Nickname: xen216
Name: XEN
First Commit: 2011-05-26
Last Commit: 2011-05-26
Number of Commits: 1
Last Commit: 2011-06-04
Number of Commits: 2
Nickname: xenfasa
Name: Ben
......@@ -2560,8 +2566,8 @@ SF Role: Developer
Nickname: yonixxx
Name: Yoni
First Commit: 2008-02-25
Last Commit: 2011-05-19
Number of Commits: 31
Last Commit: 2011-06-04
Number of Commits: 34
Nickname: ysoya
Name: YongHa Kim
......
This diff is collapsed.
......@@ -1679,20 +1679,10 @@ CREATE TABLE `tiki_polls` (
`active` char(1) default NULL,
`publishDate` int(14) default NULL,
`voteConsiderationSpan` int(4) default 0,
`anonym` ENUM( 'a', 'u', 'i', 'c' ) NOT NULL DEFAULT 'u',
PRIMARY KEY (`pollId`)
) ENGINE=MyISAM AUTO_INCREMENT=1 ;
ALTER TABLE tiki_polls ADD INDEX tiki_poll_lookup ( active , title );
CREATE TABLE IF NOT EXISTS `tiki_poll_votes` (
`pollId` int(11) NOT NULL,
`optionId` int(11) NOT NULL,
`voteId` int(11) NOT NULL auto_increment,
`identification` varchar(300) NOT NULL,
`time` int(11) NOT NULL,
PRIMARY KEY (`voteId`)
) ENGINE=MyISAM AUTO_INCREMENT=1 ;
DROP TABLE IF EXISTS `tiki_preferences`;
CREATE TABLE `tiki_preferences` (
`name` varchar(40) NOT NULL default '',
......@@ -2629,7 +2619,7 @@ CREATE TABLE `users_grouppermissions` (
INSERT INTO users_grouppermissions (`groupName`,`permName`)
VALUES('Anonymous','tiki_p_view'),('Anonymous','tiki_p_search'),('Anonymous','tiki_p_download_files');
VALUES('Anonymous','tiki_p_view'),('Anonymous','tiki_p_search'),('Anonymous','tiki_p_download_files');
DROP TABLE IF EXISTS `users_groups`;
CREATE TABLE `users_groups` (
......
ALTER TABLE `tiki_blog_posts` CHANGE `priv` `priv` varchar(1) DEFAULT 'n'; # Forgotten in r33946
......@@ -10,12 +10,13 @@ if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
exit;
}
function upgrade_20101207_unique_login_tiki( $installer )
function upgrade_20110609_unique_login_tiki( $installer )
{
$result = $installer->query( "select count(*) nb from users_users having count(*) > 1" );
$result = $installer->query( "select count(*) nb from users_users group by login having count(*) > 1" );
$row = $result->fetchRow();
if (intval($row['nb']) == 0) {
$result = $installer->query( "drop index login on users_users" );
$result = $installer->query( "alter table users_users add unique login (login)" );
}
}
DROP INDEX `left` ON `tiki_sefurl_regex_out`;
ALTER TABLE `tiki_sefurl_regex_out` ADD UNIQUE `left` (`left`(128));
<?php
// (c) Copyright 2002-2011 by authors of the Tiki Wiki CMS Groupware Project
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id$
if (strpos($_SERVER["SCRIPT_NAME"],basename(__FILE__)) !== false) {
header("location: index.php");
exit;
}
function upgrade_20110610_revert_poll_additions_tiki( $installer )
{
$installer->query( "DROP TABLE IF EXISTS `tiki_poll_votes`" );
$result = $installer->fetchAll( "SHOW COLUMNS FROM `tiki_polls` WHERE `Field`='anonym'");
if ($result) {
$result = $installer->query( "ALTER TABLE `tiki_polls` DROP COLUMN `anonym`;" );
}
}
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -48,7 +48,9 @@ $base_url_https = 'https://'.$url_host.(($prefs['https_port']!='')?':'.$prefs['h
// for <base> tag, which needs the " absolute URI that acts as the base URI for resolving relative URIs", not just the root of the site
$base_uri = !empty($_SERVER['REDIRECT_SCRIPT_URI']) ? $_SERVER['REDIRECT_SCRIPT_URI'] : isset($_SERVER['SCRIPT_URI']) ? $_SERVER['SCRIPT_URI'] : $base_url;
global $smarty;
$smarty->assign('base_uri', $base_uri);
if (is_object($smarty)) {
$smarty->assign('base_uri', $base_uri);
}
// SSL options
......
......@@ -124,7 +124,9 @@ $shortPermList = array_map( 'remove_tiki_p_prefix', $permissionList );
$globalperms = Perms::get();
$globalperms->globalize( $shortPermList, $smarty, false );
$smarty->assign('globalperms', $globalperms);
if (is_object($smarty)) {
$smarty->assign( 'globalperms', $globalperms );
}
unset($allperms);
unset($tokenParams);
......@@ -457,7 +457,10 @@ if (isset($_SESSION["$user_cookie_site"])) {
// }
}
$smarty->assign( 'CSRFTicket', isset( $_SESSION['ticket'] ) ? $_SESSION['ticket'] : null);
if (is_object($smarty)) {
$smarty->assign( 'CSRFTicket', isset( $_SESSION['ticket'] ) ? $_SESSION['ticket'] : null);
}
require_once ('lib/setup/perms.php');
// --------------------------------------------------------------
// deal with register_globals
......@@ -577,4 +580,6 @@ if (!isset($_SERVER['QUERY_STRING'])) $_SERVER['QUERY_STRING'] = '';
if (!isset($_SERVER['REQUEST_URI']) || empty($_SERVER['REQUEST_URI'])) {
$_SERVER['REQUEST_URI'] = $_SERVER['PHP_SELF'] . '?' . $_SERVER['QUERY_STRING'];
}
$smarty->assign("tikidomain", $tikidomain);
if (is_object($smarty)) {
$smarty->assign("tikidomain", $tikidomain);
}
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