[geeklog-hg] geeklog: Merge with upstream
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Thu Dec 20 17:58:19 EST 2012
changeset 8881:7ac0dee05584
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/7ac0dee05584
user: Tom <websitemaster at cogeco.net>
date: Thu Dec 20 17:58:07 2012 -0500
description:
Merge with upstream
diffstat:
public_html/admin/database.php | 3 ++-
public_html/admin/install/lib-upgrade.php | 3 ++-
public_html/docs/english/config.html | 18 +++++++++---------
3 files changed, 13 insertions(+), 11 deletions(-)
diffs (91 lines):
diff -r 7087f2654989 -r 7ac0dee05584 public_html/admin/database.php
--- a/public_html/admin/database.php Thu Dec 20 17:47:02 2012 -0500
+++ b/public_html/admin/database.php Thu Dec 20 17:58:07 2012 -0500
@@ -416,7 +416,8 @@
$A = DB_fetchArray($result);
if (strcasecmp($A['Engine'], 'InnoDB') == 0) {
- if (strcasecmp($A['Support'], 'yes') == 0) {
+ if ((strcasecmp($A['Support'], 'yes') == 0) ||
+ (strcasecmp($A['Support'], 'default') == 0)) {
$retval = true;
}
break;
diff -r 7087f2654989 -r 7ac0dee05584 public_html/admin/install/lib-upgrade.php
--- a/public_html/admin/install/lib-upgrade.php Thu Dec 20 17:47:02 2012 -0500
+++ b/public_html/admin/install/lib-upgrade.php Thu Dec 20 17:58:07 2012 -0500
@@ -785,7 +785,8 @@
$A = DB_fetchArray($result);
if (strcasecmp($A['Engine'], 'InnoDB') == 0) {
- if (strcasecmp($A['Support'], 'yes') == 0) {
+ if ((strcasecmp($A['Support'], 'yes') == 0) ||
+ (strcasecmp($A['Support'], 'default') == 0)) {
$retval = true;
}
break;
diff -r 7087f2654989 -r 7ac0dee05584 public_html/docs/english/config.html
--- a/public_html/docs/english/config.html Thu Dec 20 17:47:02 2012 -0500
+++ b/public_html/docs/english/config.html Thu Dec 20 17:58:07 2012 -0500
@@ -793,10 +793,10 @@
<td valign="top"><a name="desc_user_login_method_oauth">oauth</a></td>
<td valign="top"><code>false</code></td>
<td valign="top">Whether to allow logins using <a href="http://oauth.net/">OAuth</a>. This will display a special OAuth login below the normal login field.<br>
- <strong>Note:</strong> Currently only OAuth 1.0 is support. Current login methods supported: Facebook, Twitter and LinkedIn.<br>Please note that to enable login for a
- specific method, you need an authorization class in <tt>system/classes/oauth</tt>. If you only want to allow Facebook but not Twitter users (or vice versa), simply
+ <strong>Note:</strong> Currently only OAuth 1.0 is supported. Current login methods supported: Facebook, Twitter and LinkedIn.<br>Please note that to enable login for a
+ specific method, you need an authorization class in <tt>system/classes/oauth</tt>. If you only want to allow Facebook but not Twitter users (or vice versa), simply
remove the class file for the unwanted service(s) or use the config options below. You must also update the config options below with the correct key and secret string
- ($consumer_secret) values. The PHP extenstion OpenSSL is required to be loaded.<br>
+ ($consumer_secret) values. The PHP extension OpenSSL is required to be loaded.<br>
See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
<tr>
<td valign="top"><a name="desc_facebook_login">facebook_login</a></td>
@@ -807,13 +807,13 @@
<td valign="top"><a name="desc_facebook_consumer_key">facebook_consumer_key</a></td>
<td valign="top"><code>''</code></td>
<td valign="top">Required to use Facebook OAuth login method. Visit this <a href="http://developers.facebook.com/setup/">Facebook Developers page</a>
- to create an Applicaiton to recieve your key and secret.<br>
+ to create an application to receive your key and secret.<br>
See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
<tr>
<td valign="top"><a name="desc_facebook_consumer_secret">facebook_consumer_secret</a></td>
<td valign="top"><code>''</code></td>
<td valign="top">Required to use Facebook OAuth login method. Visit this <a href="http://developers.facebook.com/setup/">Facebook Developers page</a>
- to create an Applicaiton to recieve your key and secret.<br>
+ to create an application to receive your key and secret.<br>
See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
<tr>
<td valign="top"><a name="desc_linkedin_login">linkedin_login</a></td>
@@ -824,13 +824,13 @@
<td valign="top"><a name="desc_linkedin_consumer_key">linkedin_consumer_key</a></td>
<td valign="top"><code>''</code></td>
<td valign="top">Required to use LinkedIn OAuth login method. Visit this <a href="https://www.linkedin.com/secure/developer">LinkedIn Developers page</a>
- to create an Applicaiton to recieve your API and secret key.<br>
+ to create an application to receive your API and secret key.<br>
See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
<tr>
<td valign="top"><a name="desc_linkedin_consumer_secret">linkedin_consumer_secret</a></td>
<td valign="top"><code>''</code></td>
<td valign="top">Required to use LinkedIn OAuth login method. Visit this <a href="https://www.linkedin.com/secure/developer">LinkedIn Developers page</a>
- to create an Applicaiton to recieve your API and secret key.<br>
+ to create an application to receive your API and secret key.<br>
See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
<tr>
<td valign="top"><a name="desc_twitter_login">twitter_login</a></td>
@@ -841,13 +841,13 @@
<td valign="top"><a name="desc_twitter_consumer_key">twitter_consumer_key</a></td>
<td valign="top"><code>''</code></td>
<td valign="top">Required to use Twitter OAuth login method. Visit this <a href="https://twitter.com/apps">Twitter Application page</a>
- to create an Applicaiton to recieve your consumer key and secret.<br>
+ to create an application to receive your consumer key and secret.<br>
See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
<tr>
<td valign="top"><a name="desc_twitter_consumer_secret">twitter_consumer_secret</a></td>
<td valign="top"><code>''</code></td>
<td valign="top">Required to use Twitter OAuth login method. Visit this <a href="https://twitter.com/apps">Twitter Application page</a>
- to create an Applicaiton to recieve your consumer key and secret.<br>
+ to create an application to receive your consumer key and secret.<br>
See our <a href="http://wiki.geeklog.net/index.php/OAuth">Wiki OAuth page</a> for more information.</td></tr>
<tr>
<td valign="top"><a name="desc_aftersave_user">aftersave_user</a></td>
More information about the geeklog-cvs
mailing list