clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

openid settings appearing when disabled, don't tag numbers, install admin not getting set

This commit is contained in:
Friendika 2011-07-12 23:14:38 -07:00
parent 706b6e8c84
commit 74a608e1c7
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
boot.php
View File

@ -4,7 +4,7 @@ set_time_limit(0);
ini_set('pcre.backtrack_limit', 250000); ini_set('pcre.backtrack_limit', 250000);
define ( 'FRIENDIKA_VERSION', '2.2.1038' ); define ( 'FRIENDIKA_VERSION', '2.2.1039' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1075 ); define ( 'DB_UPDATE_VERSION', 1075 );
@ -2058,6 +2058,9 @@ function get_tags($s) {
// we might be inside a bbcode color tag - leave it alone // we might be inside a bbcode color tag - leave it alone
continue; continue;
} }
// ignore strictly numeric tags like #1
if((strpos($mtch,'#') === 0) && ctype_digit(substr($mtch,1)))
continue;
if(substr($mtch,-1,1) === '.') if(substr($mtch,-1,1) === '.')
$ret[] = substr($mtch,0,-1); $ret[] = substr($mtch,0,-1);
else else

2
mod/install.php
View File

@ -140,7 +140,7 @@ function install_content(&$a) {
'$dbpass' => notags(trim($_POST['dbpass'])), '$dbpass' => notags(trim($_POST['dbpass'])),
'$dbdata' => notags(trim($_POST['dbdata'])), '$dbdata' => notags(trim($_POST['dbdata'])),
'$phpath' => $phpath, '$phpath' => $phpath,
'$adminemail' => notags(trim($_POST['adminemail'])) '$adminmail' => notags(trim($_POST['adminmail']))
)); ));
return $o; return $o;

1
mod/settings.php
View File

@ -490,6 +490,7 @@ function settings_content(&$a) {
'$h_pass' => t('Password Settings'), '$h_pass' => t('Password Settings'),
'$password1'=> array('npassword', t('New Password:'), '', ''), '$password1'=> array('npassword', t('New Password:'), '', ''),
'$password2'=> array('confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')), '$password2'=> array('confirm', t('Confirm:'), '', t('Leave password fields blank unless changing')),
'$oid_enable' => (! get_config('system','no_openid')),
'$openid' => $openid_field, '$openid' => $openid_field,
'$h_basic' => t('Basic Settings'), '$h_basic' => t('Basic Settings'),

2
view/install_db.tpl
View File

@ -27,7 +27,7 @@ $lbl_03 $lbl_04 $lbl_05
<div id="install-dbdata-end"></div> <div id="install-dbdata-end"></div>
<label for="install-admin" id="install-admin-label">$lbl_11</label> <label for="install-admin" id="install-admin-label">$lbl_11</label>
<input type="text" name="adminemail" id="install-admin" value="$adminemail" /> <input type="text" name="adminmail" id="install-admin" value="$adminmail" />
<div id="install-admin-end"></div> <div id="install-admin-end"></div>
<div id="install-tz-desc"> <div id="install-tz-desc">

3
view/settings.tpl
View File

@ -15,8 +15,9 @@ $nickname_block
{{inc field_password.tpl with $field=$password1 }}{{endinc}} {{inc field_password.tpl with $field=$password1 }}{{endinc}}
{{inc field_password.tpl with $field=$password2 }}{{endinc}} {{inc field_password.tpl with $field=$password2 }}{{endinc}}
{{ if $oid_enable }}
{{inc field_input.tpl with $field=$openid }}{{endinc}} {{inc field_input.tpl with $field=$openid }}{{endinc}}
{{ endif }}
<div class="settings-submit-wrapper" > <div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-submit" value="$submit" /> <input type="submit" name="submit" class="settings-submit" value="$submit" />