Open
Conversation
cleaned up some stuff
code is crap, but still testing
Conflicts: admin/inc/template_functions.php
added docblocks
check htmleditor on post-content
Conflicts: admin/inc/theme_functions.php
tablatronix
commented
Nov 17, 2016
admin/inc/common.php
Outdated
| require_once('menu_functions.php'); | ||
| // debugLog('headers sent: menu_functions.php ' . headers_sent()); | ||
| require_once('logging.class.php'); | ||
| // debugLog('headers sent: logging.class.php ' . headers_sent()); |
Member
Author
There was a problem hiding this comment.
debug headers already sent whitespace errors
tablatronix
commented
Nov 17, 2016
| init_pageCache(); | ||
| // debugLog('headers sent: caching_functions.php ' . headers_sent()); | ||
|
|
||
| if(defined('GSINITPAGECACHE') && constant('GSINITPAGECACHE') == true) init_pageCache(); // in case autoloading doesnt work for a particular instance. |
Member
Author
There was a problem hiding this comment.
page cache lazyload override
tablatronix
commented
Nov 17, 2016
| exec_action('common'); // @hook common common.php has completed loading resoruces, base not yet loaded | ||
| // debugLog('calling common_callout'); | ||
| if(function_exists('common_callout')) common_callout(); // @callout common_callout callout after common loaded, before templating | ||
| // callIfCallable('common_callout'); // @callout common_callout callout after common loaded, before templating |
Member
Author
There was a problem hiding this comment.
commented out, causing issues with my debugger ide
tablatronix
commented
Nov 17, 2016
| debugLog($plugin_info); | ||
| debugLog($plugins); | ||
| debugLog($pluginHooks); | ||
| } |
tablatronix
commented
Nov 17, 2016
| $ecode = $e->getCode() > 0 ? $e->getCode() : ''; | ||
| debugLog("$msg\nDEBUG BACKTRACE $ecode\n".str_repeat('=', $cols)."\n".$etrace."\n".str_repeat('-', $cols)); | ||
| } | ||
|
|
tablatronix
commented
Nov 17, 2016
| if(isset($issue)) echo ' - <a class="label-reset label label-info" href="https://github.com/GetSimpleCMS/GetSimpleCMS/issues/'.$issue.'" target="_BLANK">GITHUB ISSUE</a>'; | ||
| echo '</p></div><br>'; | ||
| } | ||
|
|
tablatronix
commented
Nov 17, 2016
|
|
||
| <div id="maincontent"> | ||
| <div class="main"> | ||
| <?php exec_action(get_filename_id().'-body'); ?> |
tablatronix
commented
Nov 17, 2016
|
|
||
| // if debugging install , wipe website.xml to trigger reinstall | ||
| if(getDef('GSDEBUGINSTALL',true) && getDef('GSDEBUGINSTALLWIPE',true)) delete_file(GSDATAOTHERPATH.GSWEBSITEFILE); | ||
|
|
Member
Author
There was a problem hiding this comment.
wipe website data on logout
tablatronix
commented
Nov 17, 2016
|
|
||
| #sa_debug_footer { | ||
| text-align: right !important; | ||
| } No newline at end of file |
tablatronix
commented
Nov 17, 2016
| if(file_exists($extra)) $archiv->addFile($extra,basename($extra)); | ||
| $extras = getDef('GSBACKUPEXTRAS',false,true); | ||
| foreach($extras as $extra){ | ||
| if(file_exists($extra)) $archiv->addFile($extra); |
Member
Author
|
Added inline comments for stuff that affects master and will probably be merged even if this is not |
Gotta restart testing again
testing complete on most function , I have a matrix for testing I will post in issue
tablatronix
commented
Mar 4, 2017
| if(isset($load['plugin']) && $load['plugin']){ | ||
|
|
||
| if(function_exists('plugin_preload_callout')) plugin_preload_callout(); // @callout plugin_preload_callout callout before loading plugin files | ||
| // callIfCallable('plugin_preload_callout'); // @callout plugin_preload_callout callout before loading plugin files |
Member
Author
There was a problem hiding this comment.
Uncomment in prod, removed as it was causing problems with my debug enviroment.
tablatronix
commented
Mar 4, 2017
| @@ -0,0 +1,3 @@ | |||
| <?php | |||
|
|
|||
| phpinfo(); | |||
# Conflicts: # admin/template/header.php
Merge branch 'master' into feature_276_menumanager # Conflicts: # admin/inc/common.php # admin/inc/theme_functions.php
tablatronix
force-pushed
the
feature_276_menumanager
branch
from
ba7e323 to
6f1df97
Compare
Merge branch 'master' into feature_276_menumanager # Conflicts: # admin/inc/common.php # admin/inc/theme_functions.php
…eCMS/GetSimpleCMS into feature_276_menumanager
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#276