Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fixed warning when compile user_guide #1249

Closed
wants to merge 7 commits into from

3 participants

@namaless

When compile user_guide get some warnings for unknow 'ci' when use tab.
Fixed.

@timw4mail

I believe this has already been corrected. If you pull again from the develop branch, and try to build, do you still get errors?

@namaless

No, I have already updated source from ellislab before push request.

I have tested now and get this error, with my fixed version working fine.

Remember, with this warning the compile working fine, but warning message it's not fashion :)

Thanks for reply.

namaless added some commits
@namaless namaless Fixed warning when compile user_guide
When compile user_guide get some warnings for unknow 'ci' when use tab.
Fixed.
37628c4
@namaless namaless - Added separation for configuration files. Now use primary path on '…
…application/config' if not found try to load in secondary path 'system/config' directory.

- Fixed loading constants.php file on Codeigniter.php file.
d6a1653
@namaless namaless Fixed loading routes.php configuration file in system/config if not f…
…ound into application/config directory.

Add BASEPATH into Config Class.
a9ee115
@namaless namaless Load before 'system/config' directory and after load 'application/con…
…fig'. This method implements my idea. Load all variable from system config file and only modified vars need to use into application config file.
e5e40fe
@namaless namaless Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter int…
…o develop
5398a92
@namaless namaless Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter int…
…o develop
b73132a
@namaless namaless Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter int…
…o develop
bb4dea8
@narfbg
Owner

The build currently produces no errors and/or warnings.

@narfbg narfbg closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 15, 2012
  1. @namaless

    Fixed warning when compile user_guide

    namaless authored
    When compile user_guide get some warnings for unknow 'ci' when use tab.
    Fixed.
  2. @namaless

    - Added separation for configuration files. Now use primary path on '…

    namaless authored
    …application/config' if not found try to load in secondary path 'system/config' directory.
    
    - Fixed loading constants.php file on Codeigniter.php file.
  3. @namaless

    Fixed loading routes.php configuration file in system/config if not f…

    namaless authored
    …ound into application/config directory.
    
    Add BASEPATH into Config Class.
  4. @namaless

    Load before 'system/config' directory and after load 'application/con…

    namaless authored
    …fig'. This method implements my idea. Load all variable from system config file and only modified vars need to use into application config file.
Commits on Sep 21, 2012
  1. @namaless
Commits on Sep 28, 2012
  1. @namaless
Commits on Oct 7, 2012
  1. @namaless
This page is out of date. Refresh to see the latest.
View
2  application/config/autoload.php → system/config/autoload.php
@@ -156,4 +156,4 @@
/* End of file autoload.php */
-/* Location: ./application/config/autoload.php */
+/* Location: ./system/config/autoload.php */
View
2  application/config/config.php → system/config/config.php
@@ -417,4 +417,4 @@
/* End of file config.php */
-/* Location: ./application/config/config.php */
+/* Location: ./system/config/config.php */
View
2  application/config/constants.php → system/config/constants.php
@@ -75,4 +75,4 @@
/* End of file constants.php */
-/* Location: ./application/config/constants.php */
+/* Location: ./system/config/constants.php */
View
2  application/config/database.php → system/config/database.php
@@ -100,4 +100,4 @@
);
/* End of file database.php */
-/* Location: ./application/config/database.php */
+/* Location: ./system/config/database.php */
View
2  application/config/doctypes.php → system/config/doctypes.php
@@ -48,4 +48,4 @@
);
/* End of file doctypes.php */
-/* Location: ./application/config/doctypes.php */
+/* Location: ./system/config/doctypes.php */
View
2  application/config/foreign_chars.php → system/config/foreign_chars.php
@@ -92,4 +92,4 @@
);
/* End of file foreign_chars.php */
-/* Location: ./application/config/foreign_chars.php */
+/* Location: ./system/config/foreign_chars.php */
View
2  application/config/hooks.php → system/config/hooks.php
@@ -38,4 +38,4 @@
/* End of file hooks.php */
-/* Location: ./application/config/hooks.php */
+/* Location: ./system/config/hooks.php */
View
10 system/config/index.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+ <title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
View
2  application/config/memcached.php → system/config/memcached.php
@@ -43,4 +43,4 @@
);
/* End of file memcached.php */
-/* Location: ./application/config/memcached.php */
+/* Location: ./system/config/memcached.php */
View
2  application/config/migration.php → system/config/migration.php
@@ -90,4 +90,4 @@
$config['migration_path'] = APPPATH . 'migrations/';
/* End of file migration.php */
-/* Location: ./application/config/migration.php */
+/* Location: ./system/config/migration.php */
View
2  application/config/mimes.php → system/config/mimes.php
@@ -170,4 +170,4 @@
);
/* End of file mimes.php */
-/* Location: ./application/config/mimes.php */
+/* Location: ./system/config/mimes.php */
View
2  application/config/profiler.php → system/config/profiler.php
@@ -39,4 +39,4 @@
/* End of file profiler.php */
-/* Location: ./application/config/profiler.php */
+/* Location: ./system/config/profiler.php */
View
2  application/config/routes.php → system/config/routes.php
@@ -68,4 +68,4 @@
$route['404_override'] = '';
/* End of file routes.php */
-/* Location: ./application/config/routes.php */
+/* Location: ./system/config/routes.php */
View
2  application/config/smileys.php → system/config/smileys.php
@@ -89,4 +89,4 @@
);
/* End of file smileys.php */
-/* Location: ./application/config/smileys.php */
+/* Location: ./system/config/smileys.php */
View
2  application/config/user_agents.php → system/config/user_agents.php
@@ -217,4 +217,4 @@
);
/* End of file user_agents.php */
-/* Location: ./application/config/user_agents.php */
+/* Location: ./system/config/user_agents.php */
View
5 system/core/CodeIgniter.php
@@ -57,11 +57,14 @@
* Load the framework constants
* ------------------------------------------------------
*/
+ // before load codeigniter constants.
+ require(BASEPATH.'config/constants.php');
+
if (defined('ENVIRONMENT') && file_exists(APPPATH.'config/'.ENVIRONMENT.'/constants.php'))
{
require(APPPATH.'config/'.ENVIRONMENT.'/constants.php');
}
- else
+ elseif ( file_exists(APPPATH.'config/constants.php') )
{
require(APPPATH.'config/constants.php');
}
View
6 system/core/Common.php
@@ -230,9 +230,13 @@ function &get_config($replace = array())
{
return $_config[0];
}
+
+ require(BASEPATH.'config/config.php');
+
+ // fix codeigniter compatibility.
+ $found = TRUE;
$file_path = APPPATH.'config/config.php';
- $found = FALSE;
if (file_exists($file_path))
{
$found = TRUE;
View
2  system/core/Config.php
@@ -58,7 +58,7 @@ class CI_Config {
*
* @var array
*/
- public $_config_paths = array(APPPATH);
+ public $_config_paths = array(BASEPATH, APPPATH);
/**
* Constructor
View
2  system/core/Router.php
@@ -139,6 +139,8 @@ public function _set_routing()
}
// Load the routes.php file.
+ include(BASEPATH.'config/routes.php');
+
if (defined('ENVIRONMENT') && is_file(APPPATH.'config/'.ENVIRONMENT.'/routes.php'))
{
include(APPPATH.'config/'.ENVIRONMENT.'/routes.php');
View
73 user_guide_src/source/_exts/configurationblock.py
@@ -0,0 +1,73 @@
+from docutils.parsers.rst import Directive, directives
+from docutils import nodes
+from string import upper
+
+class configurationblock(nodes.General, nodes.Element):
+ pass
+
+class ConfigurationBlock(Directive):
+ has_content = True
+ required_arguments = 0
+ optional_arguments = 0
+ final_argument_whitespace = True
+ option_spec = {}
+ formats = {
+ 'html': 'HTML',
+ 'xml': 'XML',
+ 'php': 'PHP',
+ 'yaml': 'YAML',
+ 'jinja': 'Twig',
+ 'html+jinja': 'Twig',
+ 'jinja+html': 'Twig',
+ 'php+html': 'PHP',
+ 'html+php': 'PHP',
+ 'ini': 'INI',
+ 'php-annotations': 'Annotations',
+ }
+
+ def run(self):
+ env = self.state.document.settings.env
+
+ node = nodes.Element()
+ node.document = self.state.document
+ self.state.nested_parse(self.content, self.content_offset, node)
+
+ entries = []
+ for i, child in enumerate(node):
+ if isinstance(child, nodes.literal_block):
+ # add a title (the language name) before each block
+ #targetid = "configuration-block-%d" % env.new_serialno('configuration-block')
+ #targetnode = nodes.target('', '', ids=[targetid])
+ #targetnode.append(child)
+
+ innernode = nodes.emphasis(self.formats[child['language']], self.formats[child['language']])
+
+ para = nodes.paragraph()
+ para += [innernode, child]
+
+ entry = nodes.list_item('')
+ entry.append(para)
+ entries.append(entry)
+
+ resultnode = configurationblock()
+ resultnode.append(nodes.bullet_list('', *entries))
+
+ return [resultnode]
+
+def visit_configurationblock_html(self, node):
+ self.body.append(self.starttag(node, 'div', CLASS='configuration-block'))
+
+def depart_configurationblock_html(self, node):
+ self.body.append('</div>\n')
+
+def visit_configurationblock_latex(self, node):
+ pass
+
+def depart_configurationblock_latex(self, node):
+ pass
+
+def setup(app):
+ app.add_node(configurationblock,
+ html=(visit_configurationblock_html, depart_configurationblock_html),
+ latex=(visit_configurationblock_latex, depart_configurationblock_latex))
+ app.add_directive('configuration-block', ConfigurationBlock)
View
13 user_guide_src/source/conf.py 100644 → 100755
@@ -18,6 +18,17 @@
# documentation root, use os.path.abspath to make it absolute, like shown here.
#sys.path.insert(0, os.path.abspath('.'))
+# .. Fix Errors
+from sphinx.highlighting import lexers
+from pygments.lexers.web import PhpLexer
+
+lexers['php'] = PhpLexer(startinline=True)
+lexers['php-annotations'] = PhpLexer(startinline=True)
+lexers['ci'] = PhpLexer(startinline=True)
+primary_domain = "php" # It seems to help sphinx in some kind (don't know why)
+
+sys.path.append(os.path.abspath('_exts'))
+
# -- General configuration -----------------------------------------------------
# If your documentation needs a minimal Sphinx version, state it here.
@@ -255,4 +266,4 @@
#epub_tocdepth = 3
# Allow duplicate toc entries.
-#epub_tocdup = True
+#epub_tocdup = True
Something went wrong with that request. Please try again.