Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

HTML_Template_Flexyのcharset問題を修正

  • Loading branch information...
commit 12e5e1754fd0c6e8ad0e196320a9a3cf88103927 1 parent 8b74ac2
@rsky authored
View
2  composer.json
@@ -12,7 +12,7 @@
"php": ">=5.3.6",
"rsky/pear-core-min": "dev-master",
"rsky/pear-pager": ">=2.4.9beta2",
- "rsky/pear-html_template_flexy": ">=1.3.13alpha5",
+ "rsky/pear-html_template_flexy": ">=1.3.13alpha6",
"pear-pear/benchmark": "1.2.9",
"pear-pear/cache_lite": "1.7.15",
"pear-pear/db": "1.7.14",
View
5 rep2/edit_user_font.php
@@ -11,7 +11,8 @@
require_once P2_LIB_DIR . '/fontconfig.inc.php';
-$flexy_options = array(
+$_flexy_options = &PEAR5::getStaticProperty('HTML_Template_Flexy', 'options');
+$_flexy_options = array(
'templateDir' => './skin',
'compileDir' => $_conf['compile_dir'] . DIRECTORY_SEPARATOR . 'fontconfig',
'locale' => 'ja',
@@ -89,7 +90,7 @@
}
// テンプレートをコンパイル
-$flexy = new HTML_Template_Flexy($flexy_options);
+$flexy = new HTML_Template_Flexy;
$flexy->compile('edit_user_font.tpl.html');
$elements = $flexy->getElements();
View
3  rep2/ic2.php
@@ -746,6 +746,7 @@ function ic2_display($url, $params)
$qf->addElement('submit', 'o');
// FlexyとQurickForm_Rendererの初期化
+ $_flexy_options = &PEAR5::getStaticProperty('HTML_Template_Flexy', 'options');
$_flexy_options = array(
'locale' => 'ja',
'charset' => 'Shift_JIS',
@@ -753,7 +754,7 @@ function ic2_display($url, $params)
'templateDir' => P2EX_LIB_DIR . '/ImageCache2/templates',
'numberFormat' => '', // ",0,'.',','" と等価
);
- $flexy = new HTML_Template_Flexy($_flexy_options);
+ $flexy = new HTML_Template_Flexy;
$rdr = new HTML_QuickForm_Renderer_ObjectFlexy($flexy);
$qf->accept($rdr);
View
3  rep2/ic2_getter.php
@@ -136,6 +136,7 @@
$qfe['close'] = $qf->addElement('button', 'close', null, $_attr_close);
// Flexy
+$_flexy_options = &PEAR5::getStaticProperty('HTML_Template_Flexy', 'options');
$_flexy_options = array(
'locale' => 'ja',
'charset' => 'Shift_JIS',
@@ -144,7 +145,7 @@
'numberFormat' => '', // ",0,'.',','" と等価
);
-$flexy = new HTML_Template_Flexy($_flexy_options);
+$flexy = new HTML_Template_Flexy;
$flexy->setData('php_self', $_SERVER['SCRIPT_NAME']);
$flexy->setData('p2vid', P2_VERSION_ID);
View
3  rep2/ic2_manager.php
@@ -36,6 +36,7 @@
}
// テンプレートエンジン初期化
+$_flexy_options = &PEAR5::getStaticProperty('HTML_Template_Flexy', 'options');
$_flexy_options = array(
'locale' => 'ja',
'charset' => 'Shift_JIS',
@@ -44,7 +45,7 @@
'numberFormat' => '', // ",0,'.',','" と等価
);
-$flexy = new HTML_Template_Flexy($_flexy_options);
+$flexy = new HTML_Template_Flexy;
// }}}
// {{{ データベース操作・ファイル削除
View
3  rep2/ic2_setter.php
@@ -121,6 +121,7 @@
// }}}
// {{{ output
+$_flexy_options = &PEAR5::getStaticProperty('HTML_Template_Flexy', 'options');
$_flexy_options = array(
'locale' => 'ja',
'charset' => 'Shift_JIS',
@@ -129,7 +130,7 @@
'numberFormat' => '', // ",0,'.',','" と等価
);
-$flexy = new HTML_Template_Flexy($_flexy_options);
+$flexy = new HTML_Template_Flexy;
$flexy->compile('ic2s.tpl.html');
if (!$isPopUp && (!empty($upfiles) || P2Util::hasInfoHtml())) {
View
3  rep2/ic2_viewtable.php
@@ -65,6 +65,7 @@
// }}}
// {{{ 出力
+$_flexy_options = &PEAR5::getStaticProperty('HTML_Template_Flexy', 'options');
$_flexy_options = array(
'locale' => 'ja',
'charset' => 'Shift_JIS',
@@ -73,7 +74,7 @@
'numberFormat' => '', // ",0,'.',','" と等価
);
-$flexy = new HTML_Template_Flexy($_flexy_options);
+$flexy = new HTML_Template_Flexy;
$flexy->setData('php_self', $_SERVER['SCRIPT_NAME']);
$flexy->setData('p2vid', P2_VERSION_ID);
View
3  rep2/iv2.php
@@ -280,6 +280,7 @@
$qf->addRule('thumbtype', 'invalid thumbtype.', 'arrayKeyExists', $_thumbtype);
// Flexy
+$_flexy_options = &PEAR5::getStaticProperty('HTML_Template_Flexy', 'options');
$_flexy_options = array(
'locale' => 'ja',
'charset' => 'Shift_JIS',
@@ -293,7 +294,7 @@
FileCtl::mkdirRecursive($_conf['compile_dir']);
}
-$flexy = new HTML_Template_Flexy($_flexy_options);
+$flexy = new HTML_Template_Flexy;
$flexy->setData('php_self', $_SERVER['SCRIPT_NAME']);
$flexy->setData('base_dir', dirname($_SERVER['SCRIPT_NAME']));
Please sign in to comment.
Something went wrong with that request. Please try again.