Merge pull request #43 from nash-ye/develop

Momtaz v1.3.4
nash-ye · Dec 13, 2015 · 6cba39c · 6cba39c
2 parents d584313 + 4f96c77
commit 6cba39c
Show file tree

Hide file tree

Showing 63 changed files with 3,420 additions and 3,778 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 Changelog:
 ================
 
+v1.3.4
+  - Enhancement: Update Nmwdhj to v1.3.4.
+  - Enhancement: Clean the code and remove the deprecated functions.
+...etc
+
 v1.3.3
   - Enhancement: Update lessCSS to v2.5.3.
   - Enhancement: Update HTML5Shiv to v3.7.3.

diff --git a/momtaz/404.php b/momtaz/404.php
@@ -22,11 +22,11 @@ function momtaz_template_content() { ?>
 		<article<?php momtaz_atts( 'entry', array( 'id' => 'post-0', 'class' => 'hentry not-found error-404' ) ) ?>>
 
 			<header<?php momtaz_atts( 'entry-header', array( 'class' => 'entry-header' ) ) ?>>
-				<h1<?php momtaz_atts( 'entry-title', array( 'class' => 'entry-title' ) ) ?>><?php _e( 'Not found', 'momtaz' ) ?></h1>
+				<h1<?php momtaz_atts( 'entry-title', array( 'class' => 'entry-title' ) ) ?>><?php esc_html_e( 'Not found', 'momtaz' ) ?></h1>
 			</header>
 
 			<div<?php momtaz_atts( 'entry-content', array( 'class' => 'entry-content' ) ) ?>>
-				<p class="error"><?php _e( 'Apologies, but the page you requested could not be found. Perhaps searching will help.', 'momtaz' ) ?></p>
+				<p><?php esc_html_e( 'Apologies, but the page you requested could not be found. Perhaps searching will help.', 'momtaz' ) ?></p>
 				<?php get_search_form() ?>
 			</div>
 
@@ -37,4 +37,4 @@ function momtaz_template_content() { ?>
 }
 
 // Load the structure template.
-momtaz_context_template( 'structure' );
+momtaz_context_template( 'structure' );
diff --git a/momtaz/comment-pingback.php b/momtaz/comment-pingback.php
@@ -14,4 +14,4 @@
 	<small><?php _e( 'Pingback:', 'momtaz' ) ?></small> <?php comment_author_link() ?>
 	<?php edit_comment_link( __( 'Edit', 'momtaz' ), '<span class="edit-link">', '</span>' ) ?>
 
-<?php /* No closing. WordPress will know where to add it. */
+<?php /* No closing. WordPress will know where to add it. */
diff --git a/momtaz/comment-trackback.php b/momtaz/comment-trackback.php
@@ -14,4 +14,4 @@
 	<small><?php _e( 'Trackback:', 'momtaz' ) ?></small> <?php comment_author_link() ?>
 	<?php edit_comment_link( __( 'Edit', 'momtaz' ), '<span class="edit-link">', '</span>' ) ?>
 
-<?php /* No closing. WordPress will know where to add it. */
+<?php /* No closing. WordPress will know where to add it. */
diff --git a/momtaz/comment.php b/momtaz/comment.php
@@ -42,7 +42,7 @@
 			<div<?php momtaz_atts( 'comment-content', array( 'class' => 'comment-content' ) ) ?>>
 
 				<?php if ( $comment->comment_approved == 0 ) : ?>
-					 <em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.', 'momtaz' ) ?></em>
+					 <em class="comment-awaiting-moderation"><?php esc_html_e( 'Your comment is awaiting moderation.', 'momtaz' ) ?></em>
 				<?php endif ?>
 
 				<?php comment_text() ?>
@@ -53,4 +53,4 @@
 
 	<?php Momtaz_Zones::call( 'comment:after' ) ?>
 
-<?php /* No closing. WordPress will know where to add it. */
+<?php /* No closing. WordPress will know where to add it. */
diff --git a/momtaz/comments-loop.php b/momtaz/comments-loop.php
@@ -64,8 +64,8 @@
 
 if ( ! comments_open() && get_comments_number() > 0 ) : ?>
 
-	<p class="alert comments-closed">
-		<?php _e( 'Comments are closed.', 'momtaz' ) ?>
+	<p class="comments-closed">
+		<?php esc_html_e( 'Comments are closed.', 'momtaz' ) ?>
 	</p> <!-- .comments-closed -->
 
-<?php endif;
+<?php endif;
diff --git a/momtaz/comments-nav.php b/momtaz/comments-nav.php
@@ -16,4 +16,4 @@
 
 	</nav> <!-- .comment-navigation -->
 
-<?php endif;
+<?php endif;
diff --git a/momtaz/comments.php b/momtaz/comments.php
@@ -42,4 +42,4 @@
 
 	</section> <!-- #comments -->
 
-<?php Momtaz_Zones::call( 'comments:after' );
+<?php Momtaz_Zones::call( 'comments:after' );
diff --git a/momtaz/entry-footer.php b/momtaz/entry-footer.php
@@ -28,10 +28,7 @@
 
 				<?php
 
-					printf( __( '<span class="prep entry-utility-prep">Categories:</span> %s', 'momtaz' ),
-							$post_category
-						 );
-
+					printf( __( '<span class="prep entry-utility-prep">Categories:</span> %s', 'momtaz' ), $post_category );
 					$show_sep = true;
 
 				?>
@@ -57,10 +54,7 @@
 
 				<?php
 
-					printf( __( '<span class="prep entry-utility-prep">Tags:</span> %s', 'momtaz' ),
-							$post_tags
-						 );
-
+					printf( __( '<span class="prep entry-utility-prep">Tags:</span> %s', 'momtaz' ), $post_tags );
 					$show_sep = true;
 
 				?>
@@ -71,4 +65,4 @@
 
 	?>
 
-</footer>
+</footer>
diff --git a/momtaz/entry-header.php b/momtaz/entry-header.php
@@ -79,4 +79,4 @@
 
 	</div> <!-- .entry-meta -->
 
-</header> <!-- .entry-header -->
+</header> <!-- .entry-header -->
diff --git a/momtaz/entry-singular.php b/momtaz/entry-singular.php
@@ -57,9 +57,9 @@
 
 					<?php the_content();  ?>
 
-					<div class="download">
+					<div class="attachment-file">
 						<a href="<?php echo esc_url( wp_get_attachment_url() ) ?>" type="<?php echo esc_attr( get_post_mime_type() ) ?>"><?php printf( __( 'Download &quot;%s&quot;', 'momtaz' ), the_title( '<span class="fn">', '</span>', false ) ) ?></a>
-					</div> <!-- .download -->
+					</div> <!-- .attachment-file -->
 
 				<?php } ?>
 
@@ -83,4 +83,4 @@
 
 Momtaz_Zones::call( 'entry:after' );
 
-comments_template( '/comments.php', true );
+comments_template( '/comments.php', true );
diff --git a/momtaz/entry.php b/momtaz/entry.php
@@ -24,12 +24,12 @@
 			if ( function_exists( 'get_the_image' ) ) {
 
 				get_the_image( array(
-					'before'		=> '<div class="entry-thumbnail">',
-					'after'			=> '</div><!-- .entry-thumbnail -->',
-					'image_class'	=> 'thumbnail',
-					'scan'			=> true,
-					'height'		=> 150,
-					'width'			=> 150,
+					'before'        => '<div class="entry-thumbnail">',
+					'after'         => '</div><!-- .entry-thumbnail -->',
+					'image_class'   => 'thumbnail',
+					'scan'          => true,
+					'height'        => 150,
+					'width'         => 150,
 				) );
 
 			} // end if
@@ -50,4 +50,4 @@
 
 </article><?php
 
-Momtaz_Zones::call( 'entry:after' );
+Momtaz_Zones::call( 'entry:after' );
diff --git a/momtaz/footer-main.php b/momtaz/footer-main.php
@@ -13,4 +13,4 @@
 	<p class="site-credits"><?php printf( __( 'Proudly powered by %1$s and %2$s Theme', 'momtaz' ), momtaz_get_wp_link(), momtaz_get_theme_link( get_stylesheet() ) ) ?></p>
 </footer>
 
-<?php Momtaz_Zones::call( 'footer:after' );
+<?php Momtaz_Zones::call( 'footer:after' );
diff --git a/momtaz/footer.php b/momtaz/footer.php
@@ -9,4 +9,4 @@
 
 wp_footer() ?>
 </body>
-</html>
+</html>
diff --git a/momtaz/header-main.php b/momtaz/header-main.php
@@ -27,4 +27,4 @@
 
 Momtaz_Zones::call( 'header:after' );
 
-momtaz_template_part( 'menu', 'primary' );
+momtaz_template_part( 'menu', 'primary' );
diff --git a/momtaz/header.php b/momtaz/header.php
@@ -28,4 +28,4 @@
 <!-- end WP Head -->
 </head>
 
-<body<?php momtaz_atts( 'body' ) ?>>
+<body<?php momtaz_atts( 'body' ) ?>>
diff --git a/momtaz/humans.txt b/momtaz/humans.txt
@@ -1,20 +1,19 @@
-/* TEAM */
-Founding Developer: Nashwan Doaqan
-Site: http://nashwan-d.com
-Location: Ta'izz, Yemen
-\
-Core Contributor: Aboelabbas Shahwan‎‏
-Site: http://wphawy.com
-Location: Zagazig, Egypt
-
-/* THANKS */
-Rasheed Bydousi (http://rasheed-bydousi.com)
-
-/* Projects */
-Hybrid Theme, Genesis Theme,
-Normalize.CSS, Semantic.gs,
-HTML5 Shiv, Less.js,
-jQuery, Superfish
-
-/* META */
+/* TEAM */
+Founding Developer: Nashwan Doaqan
+Site: http://nashwan-d.com
+Location: Ta'izz, Yemen
+
+Core Contributor: Aboelabbas Shahwan‎‏
+Site: http://wphawy.com
+Location: Zagazig, Egypt
+
+/* THANKS */
+Rasheed Bydousi (http://rasheed-bydousi.com)
+
+/* Projects */
+Hybrid Theme, Genesis Theme,
+Normalize.CSS, HTML5 Shiv,
+Less.js, jQuery
+
+/* META */
 Last update: 2014/8/13
diff --git a/momtaz/includes/admin/admin.php b/momtaz/includes/admin/admin.php
@@ -19,7 +19,7 @@
 function momtaz_admin_register_styles() {
 
 	// Register the core admin style.
-	wp_register_style( 'momtaz-core-admin', momtaz_theme_uri( 'content/styles/admin.css' ), false, Momtaz::VERSION );
+	wp_register_style( 'momtaz-core-admin', momtaz_theme_uri( 'content/styles/admin.css' ), array(), Momtaz::VERSION );
 
 }
 
@@ -33,7 +33,7 @@ function momtaz_verify_common_post_meta_box( $post, $args ){
 
 	$args = wp_parse_args( $args, array(
 		'nonce_action' => -1,
-		'nonce_name' => '',
+		'nonce_name'   => '',
 	) );
 
 	if ( ! empty( $args['nonce_name'] ) ) {
@@ -102,4 +102,4 @@ function momtaz_save_post_meta_array( $post_id, $meta ){
 
 	return true;
 
-}
+}
diff --git a/momtaz/includes/admin/settings.php b/momtaz/includes/admin/settings.php
@@ -374,19 +374,19 @@ function momtaz_meta_box_theme_display_about( $object, $box ) {
 
 	<table class="form-table">
 		<tr>
-			<th><?php _e( 'Theme:', 'momtaz' ) ?></th>
+			<th><?php esc_html_e( 'Theme:', 'momtaz' ) ?></th>
 			<td><a href="<?php echo esc_url( $theme_data->display( 'ThemeURI' ) ) ?>"><?php echo $theme_data->display( 'Name' ) ?> <?php echo $theme_data->display( 'Version' ) ?></a></td>
 		</tr>
 		<tr>
-			<th><?php _e( 'Author:', 'momtaz' ) ?></th>
+			<th><?php esc_html_e( 'Author:', 'momtaz' ) ?></th>
 			<td><?php echo $theme_data->display( 'Author' ) ?></td>
 		</tr>
 		<tr>
-			<th><?php _e( 'Description:', 'momtaz' ) ?></th>
+			<th><?php esc_html_e( 'Description:', 'momtaz' ) ?></th>
 			<td><?php echo $theme_data->display( 'Description' ) ?></td>
 		</tr>
 	</table> <!-- .form-table -->
 
 <?php }
 
-new Momtaz_Settings_Page();
+new Momtaz_Settings_Page();
diff --git a/momtaz/includes/core/context.php b/momtaz/includes/core/context.php
@@ -227,4 +227,4 @@ function momtaz_get_post_context( $post = null ) {
 
 	return (array) apply_filters( 'momtaz_post_context', $context[ $post->ID ], $post );
 
-}
+}
diff --git a/momtaz/includes/core/modules.php b/momtaz/includes/core/modules.php
@@ -625,4 +625,4 @@ public function offsetUnset( $offset ) {
  *
  * @since 1.1
  */
-class Momtaz_Module_Exception extends Exception {}
+class Momtaz_Module_Exception extends Exception {}