Changeset 5545

Show
Ignore:
Timestamp:
12/19/07 17:21:40 (5 years ago)
Author:
p_lindheimer
Message:

Merged revisions 5544 via svnmerge from
http://svn.freepbx.org/modules/branches/2.4

........

r5544 | p_lindheimer | 2007-12-19 14:18:10 -0800 (Wed, 19 Dec 2007) | 1 line


#2575 check if out, etc. functions exist in case run from CLI

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.3

    • Property svnmerge-integrated changed from /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516 to /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990,3998,4007,4022-4023,4089,4092,4098,4265,4285 /modules/branches/2.4:1-5079,5090,5093,5097-5118,5120-5170,5172,5174,5176-5182,5184-5199,5202-5203,5205-5211,5239,5271-5272,5312,5383,5516,5544

  • modules/branches/2.3/framework/install.php

    r4526 r5545  
    8787} 
    8888 
    89 function out($text) { 
    90   echo $text."<br>"; 
     89if (! function_exists("out")) { 
     90  function out($text) { 
     91    echo $text."<br>"; 
     92  } 
    9193} 
    9294 
    93 function outn($text) { 
    94   echo $text; 
     95if (! function_exists("outn")) { 
     96  function outn($text) { 
     97    echo $text; 
     98  } 
    9599} 
    96100 
    97 function error($text) { 
    98   echo "[ERROR] ".$text."<br>"; 
     101if (! function_exists("error")) { 
     102  function error($text) { 
     103    echo "[ERROR] ".$text."<br>"; 
     104  } 
    99105} 
    100106 
    101 function fatal($text) { 
    102   echo "[FATAL] ".$text."<br>"; 
    103   exit(1); 
     107if (! function_exists("fatal")) { 
     108  function fatal($text) { 
     109    echo "[FATAL] ".$text."<br>"; 
     110    exit(1); 
     111  } 
    104112} 
    105113 
    106 function debug($text) { 
    107   global $debug; 
    108    
    109   if ($debug) echo "[DEBUG-preDB] ".$text."<br>"; 
     114if (! function_exists("debug")) { 
     115  function debug($text) { 
     116    global $debug; 
     117     
     118    if ($debug) echo "[DEBUG-preDB] ".$text."<br>"; 
     119  } 
    110120} 
    111121?>