diff options
| -rw-r--r-- | phpBB/admin/admin_styles.php | 28 | ||||
| -rw-r--r-- | phpBB/language/lang_english/lang_admin.php | 3 | ||||
| -rwxr-xr-x | phpBB/templates/subSilver/admin/styles_edit_body.tpl | 2 |
3 files changed, 17 insertions, 16 deletions
diff --git a/phpBB/admin/admin_styles.php b/phpBB/admin/admin_styles.php index c178e8f583..19dba23335 100644 --- a/phpBB/admin/admin_styles.php +++ b/phpBB/admin/admin_styles.php @@ -113,7 +113,7 @@ switch( $mode ) if( !$result = $db->sql_query($sql) ) { - message_die(GENERAL_ERROR, "Could not insert theme data!", "Error", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, "Could not insert theme data!", "", __LINE__, __FILE__, $sql); } $message = $lang['Theme_installed'] . "<br /><br />" . sprintf($lang['Click_return_styleadmin'], "<a href=\"" . append_sid("admin_styles.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); @@ -146,7 +146,7 @@ switch( $mode ) WHERE style_name = '" . str_replace("\'", "''", $style_name) . "'"; if(!$result = $db->sql_query($sql)) { - message_die(GENREAL_ERROR, "Could not query themes table!", "Error", __LINE__, __FILE__, $sql); + message_die(GENREAL_ERROR, "Could not query themes table!", "", __LINE__, __FILE__, $sql); } if(!$db->sql_numrows($result)) @@ -298,7 +298,7 @@ switch( $mode ) if(!$result = $db->sql_query($sql)) { - message_die(GENERAL_ERROR, "Could not update themes table!", "Error", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, "Could not update themes table!", "", __LINE__, __FILE__, $sql); } // @@ -309,7 +309,7 @@ switch( $mode ) WHERE themes_id = $style_id"; if(!$result = $db->sql_query($sql)) { - message_die(GENERAL_ERROR, "Could not get data from themes_name table", "Error", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, "Could not get data from themes_name table", "", __LINE__, __FILE__, $sql); } if($db->sql_numrows($result) > 0) @@ -367,7 +367,7 @@ switch( $mode ) if(!$result = $db->sql_query($sql)) { - message_die(GENERAL_ERROR, "Could not update themes name table!", "Error", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, "Could not update themes name table!", "", __LINE__, __FILE__, $sql); } $message = $lang['Theme_updated'] . "<br /><br />" . sprintf($lang['Click_return_styleadmin'], "<a href=\"" . append_sid("admin_styles.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); @@ -384,7 +384,7 @@ switch( $mode ) WHERE style_name = '" . str_replace("\'", "''", $updated['style_name']) . "'"; if(!$result = $db->sql_query($sql)) { - message_die(GENERAL_ERROR, "Could not query themes table", "Error", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, "Could not query themes table", "", __LINE__, __FILE__, $sql); } if($db->sql_numrows($result)) @@ -430,7 +430,7 @@ switch( $mode ) if(!$result = $db->sql_query($sql)) { - message_die(GENERAL_ERROR, "Could not update themes table!", "Error", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, "Could not update themes table!", "", __LINE__, __FILE__, $sql); } $style_id = $db->sql_nextid(); @@ -468,7 +468,7 @@ switch( $mode ) if(!$result = $db->sql_query($sql)) { - message_die(GENERAL_ERROR, "Could not insert themes name table!", "Error", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, "Could not insert themes name table!", "", __LINE__, __FILE__, $sql); } $message = $lang['Theme_created'] . "<br /><br />" . sprintf($lang['Click_return_styleadmin'], "<a href=\"" . append_sid("admin_styles.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); @@ -495,7 +495,7 @@ switch( $mode ) WHERE themes_id = $style_id"; if(!$result = $db->sql_query($sql)) { - message_die(GENERAL_ERROR, "Could not get data from themes table", "Error", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, "Could not get data from themes table", "", __LINE__, __FILE__, $sql); } $selected_values = $db->sql_fetchrow($result); @@ -508,7 +508,7 @@ switch( $mode ) WHERE themes_id = $style_id"; if(!$result = $db->sql_query($sql)) { - message_die(GENERAL_ERROR, "Could not get data from themes name table", "Error", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, "Could not get data from themes name table", "", __LINE__, __FILE__, $sql); } $selected_names = $db->sql_fetchrow($result); @@ -614,7 +614,7 @@ switch( $mode ) "L_SPAN_CLASS_1" => $lang['span_class1'], "L_SPAN_CLASS_2" => $lang['span_class2'], "L_SPAN_CLASS_3" => $lang['span_class3'], - + "L_SAVE_SETTINGS" => $lang['Save_Settings'], "THEME_NAME" => $selected['style_name'], "HEAD_STYLESHEET" => $selected['head_stylesheet'], "BODY_BACKGROUND" => $selected['body_background'], @@ -856,7 +856,7 @@ switch( $mode ) WHERE themes_id = $style_id"; if(!$result = $db->sql_query($sql, BEGIN_TRANSACTION)) { - message_die(GENERAL_ERROR, "Could not remove style data!", "Error", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, "Could not remove style data!", "", __LINE__, __FILE__, $sql); } // @@ -872,7 +872,7 @@ switch( $mode ) WHERE user_style = $style_id"; if(!$result = $db->sql_query($sql, END_TRANSACTION)) { - message_die(GENERAL_ERROR, "Could not update user style information", "Error", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, "Could not update user style information", "", __LINE__, __FILE__, $sql); } $message = $lang['Style_removed'] . "<br /><br />" . sprintf($lang['Click_return_styleadmin'], "<a href=\"" . append_sid("admin_styles.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>"); @@ -888,7 +888,7 @@ switch( $mode ) ORDER BY template_name"; if(!$result = $db->sql_query($sql)) { - message_die(GENERAL_ERROR, "Could not get style information!", "Error", __LINE__, __FILE__, $sql); + message_die(GENERAL_ERROR, "Could not get style information!", "", __LINE__, __FILE__, $sql); } $style_rowset = $db->sql_fetchrowset($result); diff --git a/phpBB/language/lang_english/lang_admin.php b/phpBB/language/lang_english/lang_admin.php index 45ba5ea0c7..c79cdc68cc 100644 --- a/phpBB/language/lang_english/lang_admin.php +++ b/phpBB/language/lang_english/lang_admin.php @@ -587,6 +587,7 @@ $lang['Theme_settings'] = "Theme Settings"; $lang['Theme_element'] = "Theme Element"; $lang['Simple_name'] = "Simple Name"; $lang['Value'] = "Value"; +$lang['Save_Settings'] = "Save Settings"; $lang['Stylesheet'] = "CSS Stylesheet"; $lang['Background_image'] = "Background Image"; @@ -692,4 +693,4 @@ $lang['Install_Method'] = "Choose your installation method"; // That's all Folks! // ------------------------------------------------- -?> +?>
\ No newline at end of file diff --git a/phpBB/templates/subSilver/admin/styles_edit_body.tpl b/phpBB/templates/subSilver/admin/styles_edit_body.tpl index 664fe0a89e..3f3c73181b 100755 --- a/phpBB/templates/subSilver/admin/styles_edit_body.tpl +++ b/phpBB/templates/subSilver/admin/styles_edit_body.tpl @@ -238,7 +238,7 @@ <tr> - <td class="catBottom" colspan="3" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="Save Settings" class="mainoption" /> + <td class="catBottom" colspan="3" align="center">{S_HIDDEN_FIELDS}<input type="submit" name="submit" value="{L_SAVE_SETTINGS}" class="mainoption" /> </td> </tr> </table></form> |