ehh, hmm: include -> require

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2209 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index fadc568487e4fc8cb1825da675ee38534f7affae..1a304005bd4e146f772bb3f8b11aef5eb3a8519c 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -12,7 +12,7 @@
  * $Id$
  */
 
-include_once('../functions/strings.php');
+require_once('../functions/strings.php');
 
 define('PG_SEL_MAX', 10);  /* Default value for page_selector_max. */
 

diff --git a/functions/page_header.php b/functions/page_header.php
index 2ab967f33ef12f7da09c5042b7dfecbc07f65ff8..c84f83978c15d8c910033cbffd38b92bca2bd4ca 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -11,7 +11,7 @@
  * $Id$
  */
 
-include_once('../functions/strings.php');
+require_once('../functions/strings.php');
 
 // Always set up the language before calling these functions
 function displayHtmlHeader( $title = 'SquirrelMail', $xtra = '', $do_hook = TRUE ) {

diff --git a/src/addrbook_search.php b/src/addrbook_search.php
index 46e6cdc743cd6473ae0a565f6f44b026cb8ad367..5cb11ff1081d385c530e6f61afafeaed7e0ea140 100644 (file)
--- a/src/addrbook_search.php
+++ b/src/addrbook_search.php
@@ -16,6 +16,7 @@
  */
 
 require_once('../src/validate.php');
+require_once('../functions/strings.php');
 
 /* Function to include JavaScript code */
 function insert_javascript() {

diff --git a/src/options.php b/src/options.php
index fe7a68afd6f45c0bbd499f71f38be5cb7b6f7e60..dad4282779dd1ed622c1355ce8aa1c1ee8884b97 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -17,7 +17,7 @@ require_once('../functions/display_messages.php');
 require_once('../functions/imap.php');
 require_once('../functions/array.php');
 require_once('../functions/options.php');
-include_once('../functions/strings.php');
+require_once('../functions/strings.php');
 
 /* Set the base uri. */
 ereg ("(^.*/)[^/]+/[^/]+$", $PHP_SELF, $regs);

diff --git a/src/options_highlight.php b/src/options_highlight.php
index edb6acd6e6ea3b66b7b1ed3b18910aed6e45a7fe..cd7723d24f08506651260c0a960dab8d902bb10d 100644 (file)
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -16,7 +16,7 @@ require_once('../functions/display_messages.php');
 require_once('../functions/imap.php');
 require_once('../functions/array.php');
 require_once('../functions/plugin.php');
-include_once('../functions/strings.php');
+require_once('../functions/strings.php');
 
 function oh_opt( $val, $sel, $tit ) {
     echo "<option value=\"$val\"";

diff --git a/src/search.php b/src/search.php
index 856f772414da987a6f86eda51eb79e5a16064a16..65e1695aebea571d689dad5d4fce74576fdfdd3a 100644 (file)
--- a/src/search.php
+++ b/src/search.php
@@ -13,7 +13,7 @@ require_once('../src/validate.php');
 require_once('../functions/imap.php');
 require_once('../functions/imap_search.php');
 require_once('../functions/array.php');
-include_once('../functions/strings.php');
+require_once('../functions/strings.php');
 
 function s_opt( $val, $sel, $tit ) {
     echo "            <option value=\"$val\"";

diff --git a/src/signout.php b/src/signout.php
index 75a36ccfa38e89f8a0f3cfe8d5e0f7138e58e84a..83cc1fca2c191d8b1db83fd1656011085bc1ef30 100644 (file)
--- a/src/signout.php
+++ b/src/signout.php
@@ -30,7 +30,7 @@
 require_once('../src/validate.php');
 require_once('../functions/prefs.php');
 require_once('../functions/plugin.php');
-include_once('../functions/strings.php');
+require_once('../functions/strings.php');
 
    // Erase any lingering attachments
    if (! isset($attachments)) {

diff --git a/themes/darkness.php b/themes/darkness.php
index 3a08f545bc7e57c4842c0af17b9242020366673f..073cb7421f8ba66c3a5d6c5f2d5d8532c3cb00f7 100755 (executable)
--- a/themes/darkness.php
+++ b/themes/darkness.php
@@ -7,7 +7,7 @@
    **/
 
 
-include_once('../functions/strings.php');
+require_once('../functions/strings.php');
 
    // Note:  The text distance is actually pre-squared
    // Background range is from 24-64, all three colors are the same