diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-08-16 13:03:00 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-08-16 13:03:00 +0000 |
| commit | da65cd13974a42fe5a551a0b66cb3f3a6db6dcf4 (patch) | |
| tree | 106c27b96cca8352d32b8b473891f8ef8e9187a0 | |
| parent | 3a2f8753f6439deda28bf5cc2fa3af081e443e91 (diff) | |
| download | forums-da65cd13974a42fe5a551a0b66cb3f3a6db6dcf4.tar forums-da65cd13974a42fe5a551a0b66cb3f3a6db6dcf4.tar.gz forums-da65cd13974a42fe5a551a0b66cb3f3a6db6dcf4.tar.bz2 forums-da65cd13974a42fe5a551a0b66cb3f3a6db6dcf4.tar.xz forums-da65cd13974a42fe5a551a0b66cb3f3a6db6dcf4.zip | |
only some space/tab changes as well as removing my debug code from the template file. ;)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8761 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/adm/style/acp_styles.html | 12 | ||||
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_template.php | 50 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 8 |
4 files changed, 14 insertions, 57 deletions
diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 652bdbd372..bebbdb4235 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -261,11 +261,11 @@ <!-- ELSEIF S_CACHE --> <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> - + <h1>{L_TEMPLATE_CACHE}</h1> - + <p>{L_TEMPLATE_CACHE_EXPLAIN}</p> - + <form name="acp_styles" method="post" action="{U_ACTION}"> <fieldset class="tabulated"> <legend>{L_TEMPLATE_CACHE}</legend> @@ -361,7 +361,7 @@ </p> </fieldset> - + </form> <!-- ELSEIF S_FRONTEND --> @@ -464,7 +464,7 @@ <!-- IF S_SUPERTEMPLATE --> <dl> <dt><label for="inheriting">{L_INHERITING_FROM}:</label></dt> - <dd> <b id="inheriting">{S_SUPERTEMPLATE}</b></dd> + <dd><b id="inheriting">{S_SUPERTEMPLATE}</b></dd> </dl> <!-- ENDIF --> <!-- IF S_STYLE and not S_BASIS --> @@ -513,7 +513,7 @@ <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> {S_FORM_TOKEN} </fieldset> - + </form> <!-- ENDIF --> diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 18eb870a3d..fbbe3eeff0 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -53,6 +53,7 @@ <ol> <li><a href="#changelog">Changelog</a> <ol style="list-style-type: lower-roman;"> + <li><a href="#v302">Changes since 3.0.2</a></li> <li><a href="#v301">Changes since 3.0.1</a></li> <li><a href="#v300">Changes since 3.0.0</a></li> <li><a href="#v30rc8">Changes since RC-8</a></li> diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/functions_template.php index 436c8692b4..fef5b76fe1 100644 --- a/phpBB/includes/functions_template.php +++ b/phpBB/includes/functions_template.php @@ -50,7 +50,7 @@ class template_compile { $this->template = &$template; } - + /** * Load template source from file * @access private @@ -72,7 +72,7 @@ class template_compile if ($store_in_db) { global $db, $user; - + $sql_ary = array( 'template_id' => $this->template->files_template[$handle], 'template_filename' => $this->template->filename[$handle], @@ -80,7 +80,7 @@ class template_compile 'template_mtime' => time(), 'template_data' => trim(@file_get_contents($this->template->files[$handle])), ); - + $sql = 'INSERT INTO ' . STYLES_TEMPLATE_DATA_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); $db->sql_query($sql); } @@ -518,50 +518,6 @@ class template_compile else if (!empty($token)) { $token = '(' . $token . ')'; - /** - * If we need to really secure the usage, or force specific types on specific operations... the following would be the code - - if (!isset($tokens[$i - 1])) - { - unset($tokens[$i]); - break; - } - - $prev_token = trim($tokens[$i - 1]); - - switch ($prev_token) - { - // Integer - case '<': - case '>': - case '<=': - case '>=': - case '%': - $token = ( ((double) $token) != 0) ? (double) $token : (int) $token; - break; - - case '==': - case '!=': - $int_token = (((double) $token) != 0) ? (double) $token : (int) $token; - if ($int_token && $int_token == $token) - { - $token = $int_token; - break; - } - - // It is a string... - $token = '(' . $token . ')'; - break; - - case '!': - case '||': - case '&&': - default: - unset($tokens[$i]); - break; - break; - } - */ } break; diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 5e594e025b..9b066ecdaa 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -262,7 +262,7 @@ $lang = array_merge($lang, array( 'HOME' => 'Home', 'ICQ' => 'ICQ', - 'ICQ_STATUS' => 'ICQ status', + 'ICQ_STATUS' => 'ICQ status', 'IF' => 'If', 'IMAGE' => 'Image', 'IMAGE_FILETYPE_INVALID' => 'Image file type %d for mimetype %s not supported.', @@ -333,7 +333,7 @@ $lang = array_merge($lang, array( 'MODERATORS' => 'Moderators', 'MONTH' => 'Month', 'MOVE' => 'Move', - 'MSNM' => 'MSNM/WLM', + 'MSNM' => 'MSNM/WLM', 'NA' => 'N/A', 'NEWEST_USER' => 'Our newest member <strong>%s</strong>', @@ -500,7 +500,7 @@ $lang = array_merge($lang, array( 'SEARCHING_FORUMS' => 'Searching forums', 'SEARCH_ACTIVE_TOPICS' => 'View active topics', 'SEARCH_FOR' => 'Search for', - 'SEARCH_FORUM' => 'Search this forum…', + 'SEARCH_FORUM' => 'Search this forum…', 'SEARCH_NEW' => 'View new posts', 'SEARCH_POSTS_BY' => 'Search posts by', 'SEARCH_SELF' => 'View your posts', @@ -674,7 +674,7 @@ $lang = array_merge($lang, array( 'YEAR' => 'Year', 'YEAR_MONTH_DAY' => '(YYYY-MM-DD)', 'YES' => 'Yes', - 'YIM' => 'YIM', + 'YIM' => 'YIM', 'YOU_LAST_VISIT' => 'Last visit was: %s', 'YOU_NEW_PM' => 'A new private message is waiting for you in your Inbox.', 'YOU_NEW_PMS' => 'New private messages are waiting for you in your Inbox.', |